Commit Graph

1638 Commits (796289754905d53d1f4d4260e0e361070955bdd6)

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
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
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
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 faea2ecccc OBJ: Support spaces in material names, fixes #545.
Adding test file.
2015-05-10 23:50:18 +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
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
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
Highlife1911 4acb1d4c92 Removed FORCE attribute from CMake variable LIBRARY_SUFFIX 2015-05-01 14:13:28 +02:00
Alexander Gessler 2a7e49423a Merge pull request #547 from assimp/acgessler-patch-2
Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail.
2015-04-30 15:19:01 +02:00
Kim Kulling 5357772cf5 fix build.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 14:31:23 +02:00
Kim Kulling d5699cc89f fox build: add missing include for ai_assert.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 13:47:33 +02:00
Kim Kulling 31cce98680 fix color handling in opengex importer.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 12:54:59 +02:00
Alexander Gessler 78faabf0fa Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail. 2015-04-30 02:37:35 +02:00
Alexander Gessler 880cb473b0 Merge pull request #546 from terziman/master
Minor improvments & bug fixes
2015-04-30 02:35:52 +02:00
Léo Terziman c99bd9825a Fixed bug introduced by misleading names in materials properties between "type" parameters of function referring to the "semantic" field of properties (and NOT the type field...) 2015-04-29 18:13:16 +02:00
Kim Kulling 2f8f0b1b02 Merge branch 'master' of https://github.com/assimp/assimp
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ObjFileParser.cpp
2015-04-29 13:18:51 +02:00
Kim Kulling 995bc41d57 color node handling opengex
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-29 11:57:39 +02:00
Léo Terziman ca2e47b205 Fixed some typos 2015-04-29 09:26:11 +02:00
Léo Terziman 91c751a03a Added missing header 2015-04-28 12:29:39 +02:00
Léo Terziman 5b9af11f9b Merge remote-tracking branch 'official/master' into contrib 2015-04-28 12:04:53 +02:00
Alexander Gessler 5c890c1a90 Merge pull request #544 from aru/cygwin-build-fix
Modifying files to let assimp build under cygwin.
2015-04-21 15:56:40 -07:00
U-ORADEV\albihern 956fde6e66 Renaming ByteSwap.h to ByteSwapper.h to let assimp compile under cygwin. 2015-04-20 17:49:02 -05:00
U-ORADEV\albihern 7043551068 Modifying files to let assimp build under cygwin. 2015-04-20 17:36:47 -05:00
Łukasz Twarduś 55ae853c2e Fix compilation with libc++ 2015-04-19 10:55:58 +02:00
Kim Kulling eb1ee61420 fix code reading findings: use of std::copy
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:48 +02:00