Commit Graph

5188 Commits (9ca7b00280c270be68bfff7e4810e100f593133c)

Author SHA1 Message Date
Kim Kulling a88a23ac7c
Merge pull request #1549 from assimp/issue_104
Issue 104
2017-11-07 13:10:44 +01:00
Kim Kulling 75fdd25b6b
Merge branch 'master' into issue_104 2017-11-07 11:27:06 +01:00
Kim Kulling da7ce89ff2
Update STLLoader.cpp
add missing const.
2017-11-07 10:47:27 +01:00
Kim Kulling b87e7643d2
Update STLLoader.cpp
Fix memory-alignment bug.
2017-11-07 10:42:51 +01:00
Kim Kulling 4ff2592747
Update STLLoader.h
Fixed a typo.
2017-11-07 00:31:09 +01:00
Kim Kulling 26171a7949 SLD: add test model and a unit test. 2017-11-06 22:37:52 +01:00
Kim Kulling 9a9f18bbed closes https://github.com/assimp/assimp/issues/104: deal with more solids in one STL file. 2017-11-06 22:30:07 +01:00
Kim Kulling 10a6524300
Merge pull request #1545 from assimp/issue_213
closes https://github.com/assimp/assimp/issues/213: log an error inst…
2017-11-06 00:44:50 +01:00
Kim Kulling a77d9d7b21
Merge branch 'master' into issue_213 2017-11-05 23:07:08 +01:00
Kim Kulling e09349c734
Merge pull request #1544 from assimp/issue_1526
closes https://github.com/assimp/assimp/issues/1526: use correct incl…
2017-11-05 23:05:46 +01:00
Kim Kulling 4a4f3fddc7 closes https://github.com/assimp/assimp/issues/213: log an error instead of letting the fbx-importer crash. 2017-11-05 22:52:07 +01:00
Kim Kulling 6b04b20869 closes https://github.com/assimp/assimp/issues/1526: use correct include folder for assimp. 2017-11-05 22:41:41 +01:00
Kim Kulling b0e86d281b
Merge pull request #1543 from assimp/issue_1533
closes https://github.com/assimp/assimp/issues/1533:
2017-11-05 19:31:47 +01:00
Kim Kulling 5922200ec3
Merge branch 'master' into issue_1533 2017-11-05 18:53:43 +01:00
Kim Kulling 9835d28f72
Merge pull request #1542 from assimp/UnitTest_X3D
add unittest for x3d-importer.
2017-11-05 18:53:28 +01:00
Kim Kulling f43586305c closes https://github.com/assimp/assimp/issues/1533: put irrXML onto exclucde list for doxygen run. 2017-11-05 18:24:39 +01:00
Kim Kulling ab3cf3687c
Merge branch 'master' into UnitTest_X3D 2017-11-05 18:10:10 +01:00
Kim Kulling 770f531cc6 X3D-Importer: add missing file. 2017-11-05 17:46:25 +01:00
Kim Kulling 2929a27edc add unittest for x3d-importer. 2017-11-05 17:41:26 +01:00
Kim Kulling 1e9919ce81
Merge pull request #1541 from assimp/issue_1351
closes https://github.com/assimp/assimp/issues/1351: use correct name…
2017-11-05 17:18:11 +01:00
Kim Kulling 02b042d78e closes https://github.com/assimp/assimp/issues/1351: use correct name for obj-meshname export for groups. 2017-11-05 16:35:22 +01:00
Kim Kulling abca0a79f3
Merge pull request #1538 from assimp/aavenel-unittest_obj_importer
Aavenel unittest obj importer
2017-11-04 18:48:01 +01:00
Kim Kulling a33e115fd1 fix mem-lead: face will be not released in case of an error. 2017-11-04 18:26:30 +01:00
Kim Kulling c9ada44ab5 Fix memory leak in case of an error. 2017-11-04 17:05:23 +01:00
Kim Kulling 4879fe13ca Merge branch 'unittest_obj_importer' of https://github.com/aavenel/assimp 2017-11-04 16:58:35 +01:00
Kim Kulling c700c08fa5
Merge branch 'master' into master 2017-11-04 10:45:57 +01:00
Kim Kulling d5692ccf30
Merge pull request #1537 from assimp/Anatoscope-ObjExporter_nomtl
Anatoscope obj exporter nomtl
2017-11-04 10:34:29 +01:00
Kim Kulling b7bd006304
Merge branch 'master' into ObjExporter_nomtl 2017-11-04 09:32:50 +01:00
Kim Kulling eeee744e21
Merge pull request #1536 from assimp/Anatoscope-fix_trivial_warnings
Anatoscope fix trivial warnings
2017-11-04 09:31:43 +01:00
Kim Kulling 4dab6f9be3
Merge branch 'master' into Anatoscope-fix_trivial_warnings 2017-11-04 08:49:27 +01:00
Kim Kulling 4910af3814
Merge pull request #1535 from assimp/kimkulling-patch-1
Update .travis.yml
2017-11-04 08:49:02 +01:00
Kim Kulling 9a721d0ef4
Update .travis.yml
Remove unused branch rule for travis.
2017-11-04 08:24:36 +01:00
Kim Kulling 4587e63e2f
Merge branch 'master' into fix_trivial_warnings 2017-11-03 20:05:16 +01:00
Kim Kulling 56674de1d8
Merge pull request #1534 from Matter-and-Form/texturefile-int-name-fix
[PLY] fix for TextureFile with number in file name
2017-11-03 19:10:01 +01:00
Daniel Hritzkiv 2922753589
Return early when element is TextureFile
In cases where the TextureFile name would start with an integer, `strtoul10` would parse that number and incorrectly set `numOccur` to that number. This caused PLY parsing to fail for vertex positions.

Since TextureFile is a single line, and does not have any follow-up lines, it’s okay to return early
2017-11-03 11:50:28 -04:00
Kim Kulling c86c7b4518
Update .travis.sh
Retrigger travis.
2017-11-03 13:11:30 +01:00
Kim Kulling d279a3cc02
Merge branch 'master' into fix_trivial_warnings 2017-11-03 10:35:02 +01:00
Thomas Lemaire 5b76a31485 fix trivial warnings
mainly unused parameter and unused function
some parameters are indeed used in a debug built, I used the
(void)(param) trick
warnings reported by clang 4
2017-11-02 11:13:52 +01:00
thomas-lemaire 931542bf3c
Merge branch 'master' into ObjExporter_nomtl 2017-11-02 10:46:57 +01:00
Kim Kulling c666a05e16
Merge pull request #1524 from Matter-and-Form/invalid-texture-coordinates-cleaning-fix
Invalid texture coordinates cleaning fix
2017-11-02 10:46:44 +01:00
Kim Kulling ce7f379aa3
Merge branch 'master' into invalid-texture-coordinates-cleaning-fix 2017-11-01 10:53:43 +01:00
Kim Kulling 62e3ac9b4d
Merge pull request #1525 from daeyun/daeyun-lib-dirs
[pyassimp] Search for libassimp.so in LD_LIBRARY_PATH if available.
2017-11-01 10:49:05 +01:00
Daeyun Shin bf9d319489
Update helper.py
Search for libassimp.so in LD_LIBRARY_PATH if available.
2017-10-31 15:43:39 -07:00
Daniel Hritzkiv e52e44ea07
Formatting 2017-10-31 15:18:08 -04:00
Daniel Hritzkiv cc4531459f
Set mNumUVComponents to 0 when deleting texture coordinate sets 2017-10-31 15:14:21 -04:00
Kim Kulling 938c02a358
Merge pull request #1523 from assimp/issue_1490
closes https://github.com/assimp/assimp/issues/1490 : fix invalid acc…
2017-10-31 15:07:51 +01:00
Kim Kulling 8be196f77d closes https://github.com/assimp/assimp/issues/1490 : fix invalid access to mesh array when the array is empty. 2017-10-31 14:03:03 +01:00
Kim Kulling a502560da1
Merge pull request #1520 from assimp/issue_1514
Issue 1514
2017-10-31 13:37:23 +01:00
Kim Kulling af4556d569 only scale the root node because this will rescale all children nodes as well. 2017-10-31 13:08:24 +01:00
Kim Kulling 64ee21024b Add missing file. 2017-10-31 13:07:07 +01:00