8664d4b98b 
					 
					
						
						
							
							Collada: Added option for how rot,loc,trans data is exported (improves flexibility for support of other 3D tools)  
						
						
						
						
					 
					
						2013-03-06 23:21:52 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e39f05e5fa 
					 
					
						
						
							
							patch [ #34103 ] fileops_1.patch  
						
						... 
						
						
						
						from Lawrence D'Oliveiro (ldo) 
Add comments and use of bool type in fileops.c 
						
						
					 
					
						2013-03-05 03:53:22 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						be701b6278 
					 
					
						
						
							
							Collada: Added support for ngon export/import and added triangulate option to export  
						
						
						
						
					 
					
						2013-03-02 15:58:13 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						debc3ac910 
					 
					
						
						
							
							Collada export: Add ngon support (initial)  
						
						
						
						
					 
					
						2013-02-27 13:53:43 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9fe4dbb9f1 
					 
					
						
						
							
							Fix: Collada Import files with X_UP and Y_UP axis where imported with wrong orientation  
						
						
						
						
					 
					
						2013-02-15 15:36:02 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f34d1d5585 
					 
					
						
						
							
							[ #33437 ](partial fix) Collada: importing a scene changes units. Added an option to disable unit settings during import.  
						
						
						
						
					 
					
						2013-02-09 16:19:30 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c263753d17 
					 
					
						
						
							
							Added gsoc-2012 collada improvements from bratwurst branch  
						
						
						
						
					 
					
						2013-01-21 13:45:49 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f3d261d795 
					 
					
						
						
							
							Collada(exporter): Added error message when export file can not be created for whichever reason  
						
						
						
						
					 
					
						2012-09-19 19:28:29 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8ef4c4762b 
					 
					
						
						
							
							Added option for exporting material based textures. Cleaned up header files due to a bug in osx  
						
						
						
						
					 
					
						2012-06-23 22:03:31 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						adf3a5e332 
					 
					
						
						
							
							Collada: (Export) Added export of surface textures, and control over exported uv layers  
						
						
						
						
					 
					
						2012-06-22 16:16:58 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0df30d1063 
					 
					
						
						
							
							Collada: (Exporter) add 'mesh type selection(view|render)' for Apply modifiers option  
						
						
						
						
					 
					
						2012-06-16 23:35:53 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						664c95d1eb 
					 
					
						
						
							
							code cleanup: collada  
						
						... 
						
						
						
						- when bubble sorting names - dont convert to str::string just to compare strings
- use BLI_linklist_index() to check if an item is in the list
- quiet some warnings 
						
						
					 
					
						2012-06-16 09:16:24 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9f6a66d5f9 
					 
					
						
						
							
							Collada: (Exporter) Add new option 'deform bones only'  
						
						
						
						
					 
					
						2012-06-15 22:00:25 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						05a1a31693 
					 
					
						
						
							
							Collada: Added export Option 'sort by object name' to fix an issue with Second Life import  
						
						
						
						
					 
					
						2012-06-14 10:38:39 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2e8a2f7668 
					 
					
						
						
							
							style cleanup  
						
						
						
						
					 
					
						2012-06-12 22:05:33 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						36ed4818e5 
					 
					
						
						
							
							patch  #31794  Collada: make exporter more robust, now uses BKE_object_relational_superset()  
						
						
						
						
					 
					
						2012-06-12 21:25:29 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						49a5141cde 
					 
					
						
						
							
							[ #31739 ] Collada: New Export selections 'Include Armatures'  
						
						
						
						
					 
					
						2012-06-07 17:55:26 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						822362189b 
					 
					
						
						
							
							[ #31607 ] Collada: (Exporter) Implementation of 'use Object Instantiation' Option  
						
						
						
						
					 
					
						2012-05-26 22:46:28 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						da67c969b3 
					 
					
						
						
							
							Patch  #31570 : Implementation of 'Include bone children' Option  
						
						
						
						
					 
					
						2012-05-24 14:56:09 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						98ba7dfecf 
					 
					
						
						
							
							Collada: patch  #31331 : Implementation of 'Apply Modifiers'  
						
						
						
						
					 
					
						2012-05-07 18:09:59 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b8a71efeba 
					 
					
						
						
							
							style cleanup: follow style guide for/with/if spacing  
						
						
						
						
					 
					
						2012-03-24 07:52:14 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2cb3fe3dfd 
					 
					
						
						
							
							Patch  #30050  by Juha Mäki-Kanto (kanttori)  
						
						... 
						
						
						
						Fixes for Collada exporter.
Adds Second Life compatibility for armatures
Adds objects parentinverse to exported transform if it's non-identity
Fix mismatch between add_inv_bind_mats and add_joints_source accessor counts
Fix bone exports in world space should be local space 
						
						
					 
					
						2012-02-05 16:19:28 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4a04f72069 
					 
					
						
						
							
							remove $Id: tags after discussion on the mailign list:  http://markmail.org/message/fp7ozcywxum3ar7n  
						
						
						
						
					 
					
						2011-10-23 17:52:20 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e417e011d5 
					 
					
						
						
							
							Code cleanup: file operations merged into single header, some function names  
						
						... 
						
						
						
						made less cryptic and changed to indicate if they work on files or directories. 
						
						
					 
					
						2011-10-22 15:35:49 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						88473fd49a 
					 
					
						
						
							
							Code cleanup: remove BLI_exist, now there is only BLI_exists. One function just  
						
						... 
						
						
						
						called the other, they did the same thing. 
						
						
					 
					
						2011-10-21 22:33:41 +00:00 
						 
				 
			
				
					
						
							
							
								Nathan Letwory 
							
						 
					 
					
						
						
							
						
						3dc0ee19c4 
					 
					
						
						
							
							Introduce struct for export settings in COLLADA export code. This will make it easier to  
						
						... 
						
						
						
						add new options without having to change function signatures all over the place. 
						
						
					 
					
						2011-09-07 18:23:30 +00:00 
						 
				 
			
				
					
						
							
							
								Nathan Letwory 
							
						 
					 
					
						
						
							
						
						6e9ff495eb 
					 
					
						
						
							
							Add parser error handler.  
						
						... 
						
						
						
						OpenCOLLADA is a validating parser, so is pretty strict about document form. The added error handler will print out any errors the parser finds. A pop-up will be shown too, advising the user to check the console for the error log. 
						
						
					 
					
						2011-09-05 20:41:58 +00:00 
						 
				 
			
				
					
						
							
							
								Nathan Letwory 
							
						 
					 
					
						
						
							
						
						cf43e48fc7 
					 
					
						
						
							
							Apply patch 4636051. COLLADA: Export selection.  
						
						... 
						
						
						
						Original patch by Jan Diederich, adapted by Pelle Johnsen. Review assistance by Daniel Tavares.
This patch adds an option to export only the selection. 
						
						
					 
					
						2011-07-04 08:59:28 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						70d059161b 
					 
					
						
						
							
							workaround/fix [ #27162 ] Running commands in python console crashes blender  
						
						
						
						
					 
					
						2011-04-25 12:39:53 +00:00 
						 
				 
			
				
					
						
							
							
								Nathan Letwory 
							
						 
					 
					
						
						
							
						
						caf9fb6cce 
					 
					
						
						
							
							doxygen: blender/collada tagged.  
						
						
						
						
					 
					
						2011-02-27 20:30:35 +00:00 
						 
				 
			
				
					
						
							
							
								Nathan Letwory 
							
						 
					 
					
						
						
							
						
						5b607701a7 
					 
					
						
						
							
							doxygen: prevent GPL license block from being parsed as doxygen comment.  
						
						
						
						
					 
					
						2011-02-23 10:52:22 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0a4eb24ca0 
					 
					
						
						
							
							fix for building with opencollada 833 on linux.  
						
						
						
						
					 
					
						2011-02-12 06:25:04 +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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a545998c84 
					 
					
						
						
							
							Merge -c 29009,29081,29189 from COLLADA branch into trunk.  
						
						
						
						
					 
					
						2010-06-03 17:41:33 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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