8 Commits

Author	SHA1	Message	Date
Nathan Letwory	c5c4b31d6b	Mostly formatting commit, small elaboration in extra handling API (take pointer to importer).	2011-03-25 09:52:36 +00:00
Nathan Letwory	bcec824299	doxygen: COLLADA entry	2011-02-21 08:38:53 +00:00
Nathan Letwory	f3a19f4324	small typo fix	2011-02-04 13:18:44 +00:00
Nathan Letwory	7769c00385	First step towards having a 2-pass reading of COLLADA .dae files.	2011-01-28 12:56:30 +00:00
Nathan Letwory	100d611ce5	Apply patch [#25224] Refactor COLLADA DocumentImporter ... Submitted by Martijn Berger. Make DocumentImporter class the actual IWriter implementation and move prototype to the header. Group together functions that we should move out of the class. No functional changes.	2010-12-14 21:46:03 +00:00
Nathan Letwory	82209cdc86	Reorganisation of COLLADA import code. Classes have been split into their own files. ... No functional changes. Where necessary extern "C" {} blocks have been added.	2010-10-05 00:05:14 +00:00
Arystanbek Dyussenov	a545998c84	Merge -c 29009,29081,29189 from COLLADA branch into trunk.	2010-06-03 17:41:33 +00:00
Arystanbek Dyussenov	31258507d0	Merge of the COLLADA GSoC branch into trunk. ... COLLADA code is disabled by default (it has dependencies requiring manual install). SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch. The detailed command log of the merge (can be useful for educational purposes): branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook # collada code svn copy $branch/source/blender/collada source/blender/collada # operator svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c # menu svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py # scons svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript # cmake svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt	2009-10-30 15:35:50 +00:00