Commit Graph

2703 Commits

Author SHA1 Message Date
Andy Maloney
28cc934bb9 Fix overlapping merges 2015-05-18 09:51:09 -04:00
Kim Kulling
7cd8cc1b1f Merge pull request #560 from asmaloney/fixes/init_cleanup
Fix inits and a couple of empty checks
2015-05-18 09:49:59 +02:00
Kim Kulling
4bdf23aece Merge pull request #561 from LegalizeAdulthood/warnings
Fix compiler warnings
2015-05-18 09:48:01 +02:00
Richard
9cbef8cba3 Refactor: Initialize members in declaration order; prefer initialization over assignment 2015-05-17 20:50:58 -06:00
Richard
cac8707121 Refactor: Delete unused field 2015-05-17 20:48:04 -06:00
Richard
4a5e9352d6 Refactor: Delete unused functions 2015-05-17 20:46:56 -06:00
Richard
a34adb8450 Refactor: Delete unused functions 2015-05-17 20:45:16 -06:00
Richard
814ef32dce Refactor: Delete unused fields 2015-05-17 20:43:25 -06:00
Richard
5bb09377cb Refactor: Delete unused variable 2015-05-17 20:40:35 -06:00
Richard
7b3fa5ebc2 Refactor: Delete unused forward decls, delete unused function 2015-05-17 20:22:31 -06:00
Richard
79c916daf4 Refactor: Remove unused variable 2015-05-17 20:05:05 -06:00
Richard
2de6dd4973 Refactor: Delete unused variable 2015-05-17 20:02:58 -06:00
Richard
6ae9797648 Refactor: Initialize members in declaration order; initialize POD arrays 2015-05-17 20:01:51 -06:00
Richard
d25c36960a Refactor: Initialize all POD members 2015-05-17 19:57:11 -06:00
Richard
8c94e51e90 Refactor: Delete unused functions 2015-05-17 19:47:13 -06:00
Richard
fbf90a28ff Fixed: Ensure variable is always initialized before use 2015-05-17 19:46:01 -06:00
Richard
63520d562a Refactor: Initialize members in declaration order; prefer initialization over assignment 2015-05-17 19:42:30 -06:00
Richard
bf4a73e42e Refactor: Remove unused member variable 2015-05-17 19:42:07 -06:00
Andy Maloney
c014bb977c - add missing initialization of several class members
- prefer check for empty() over check for size() in OptimizeGraph (empty() is guaranteed to be constant time, size() is not)
- fix a couple of incorrect indentations
2015-05-17 20:48:23 -04:00
Alexander Gessler
93579ca734 Merge pull request #559 from shocker-0x15/fix_assbin_release_and_AddGTest_CMake
Fixed AssBin loader.
2015-05-17 12:59:27 +02:00
shin_mbpr_late2013
6c01bcff53 Reverted AddGTest.cmake.
Changes to the file caused CI build broken.
2015-05-17 00:36:19 +09:00
shin_mbpr_late2013
98b234020b Fixed AssBin loader.
File reads were used in ai_assert. The function has side effects, so it should not be used in an assert.
Fixed AddGTest.cmake.
There was an issue regarding Xcode project file. The path of libgtest.a was incorrectly set.
2015-05-16 23:39:24 +09:00
Kim Kulling
e1cf5150f1 Merge pull request #558 from wise86-android/fixImportTest
test fail, fix file path
2015-05-16 13:36:27 +02:00
wise86Android
af54bf4c42 test fail, fix file path 2015-05-16 12:28:49 +02:00
Alexander Gessler
a1268bf864 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-12 21:52:25 +02:00
Alexander Gessler
0fe8e739c3 Use "wb" when writing binary STL exports, fixes #556. 2015-05-12 21:51:27 +02:00
Alexander Gessler
e3c29b7e4b Merge pull request #554 from assimp/fix-obj-material-name-spaces
OBJ: Support spaces in material names, fixes #545.
2015-05-12 21:44:07 +02:00
Alexander Gessler
7771ce5db2 Update regression db. 2015-05-12 20:59:54 +02:00
Alexander Gessler
faea2ecccc OBJ: Support spaces in material names, fixes #545.
Adding test file.
2015-05-10 23:50:18 +02:00
Alexander Gessler
696407f6c5 Merge pull request #552 from abma/master
allow to compile only enabled importers
2015-05-07 11:49:19 +02:00
abma
b4f5c57b3e allow to compile only enabled loaders 2015-05-06 23:15:15 +02:00
Kim Kulling
70722ad318 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-05 22:27:13 +02:00
Kim Kulling
fd3a0d4a9d fix name handling of geoemtryobjectname nodes
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:27:05 +02:00
Kim Kulling
2c60da38f3 openddl-parser: V0.2.0
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:26:40 +02:00
Alexander Gessler
01bd198a55 Merge pull request #549 from Madrich/master
Step (stp) Exporter
2015-05-02 19:28:28 +02:00
Madrich
b6d91ec11a Fix Path functions
Fix XFilePrefix for mesh name
Add Color for faces in Step Export
2015-05-02 12:19:20 +02:00
Madrich
2dde962f0d FilePath Functions in DefaultIOSystems
Replacements in Exporters
2015-05-02 01:56:20 +02:00
Alexander Gessler
437706f20d Merge pull request #535 from assimp/regression-whitelist-travis-diff
Regression whitelist, add regression diff test to Travis CI
2015-05-02 01:30:52 +02:00
Alexander Gessler
67fb135ce8 Fix syntax errors. 2015-05-02 01:00:04 +02:00
Alexander Gessler
068778953a Updated regression db for Collada. 2015-05-02 00:48:04 +02:00
Alexander Gessler
1851bf3acc Merge branch 'master' of https://github.com/assimp/assimp 2015-05-02 00:39:28 +02:00
Alexander Gessler
7eb5586c05 Output files in alphabetical order. 2015-05-02 00:33:29 +02:00
Alexander Gessler
8fb9e84aea Cleanup old messages. 2015-05-02 00:10:51 +02:00
Alexander Gessler
09d1e53955 Forgot semicolon. 2015-05-02 00:10:00 +02:00
Alexander Gessler
3ded2d9123 Add script to determine if regression suite failures are considered acceptable as per the whitelist or not. 2015-05-01 23:24:25 +02:00
Madrich
148207a073 Fix removed AssimpPCH 2015-05-01 23:16:44 +02:00
Madrich
71ae322e7b Merge pull request #5 from assimp/master
Update Fork
2015-05-01 23:01:33 +02:00
Madrich
58a72d9302 Fix Warnings
Add Time in Step File
2015-05-01 22:19:40 +02:00
Madrich
ca8a3909be Add StepExporter.cpp(stp) Export
Fix XFile
2015-05-01 21:40:51 +02:00
Alexander Gessler
93bb63fdb4 Merge pull request #548 from Highlife1911/master
Removed FORCE attribute from CMake variable LIBRARY_SUFFIX
2015-05-01 17:14:22 +02:00