ca16488e81 
					 
					
						
						
							
							MSVC 9 compile fixes and cleanups  
						
						 
						
						... 
						
						
						
						* added renamed files in revision 25337
* renamed BLI_util.h -> BLI_path_util.h for consistency
* cleanup of #includes: removed BLI_blenlib.h in favour of direct includes of the needed headerfiles in a few places.
* removed debug print in sequencer.c
* added missing include in blenkernel/blender.c -> bad dependency, needs to be fixed still 
						
						
					 
					
						2009-12-13 17:46:30 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						92b4316708 
					 
					
						
						
							
							Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail.  
						
						 
						
						
						
						
					 
					
						2009-11-29 19:16:52 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b40307df16 
					 
					
						
						
							
							add access to bone add/remove from rna. eg.  
						
						 
						
						... 
						
						
						
						bone = arm.edit_bones.new("SomeBone")
 arm.edit_bones.remove(bone)
regify (WIP) 
						
						
					 
					
						2009-11-25 11:05:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						284f66acf7 
					 
					
						
						
							
							Fix for last commit, forgot to update collada.  
						
						 
						
						
						
						
					 
					
						2009-11-24 12:35:06 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						67c295da9c 
					 
					
						
						
							
							rename pose_channels to bones  
						
						 
						
						... 
						
						
						
						was: object.pose.pose_channels["Bone"]
now: object.pose.bones["Bone"] 
						
						
					 
					
						2009-11-18 11:40:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6df83fba02 
					 
					
						
						
							
							Merge -c 24547 from COLLADA branch (fix flipping of triangles created by tesselation).  
						
						 
						
						
						
						
					 
					
						2009-11-13 15:48:45 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						fdcc0ff7c7 
					 
					
						
						
							
							Merge -c 24531 from COLLADA branch (fix holes in imported meshes).  
						
						 
						
						
						
						
					 
					
						2009-11-12 17:08:32 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0adfc00e40 
					 
					
						
						
							
							Merged -c 24514 from COLLADA branch (build edges on mesh import).  
						
						 
						
						
						
						
					 
					
						2009-11-12 03:41:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9256408612 
					 
					
						
						
							
							Fix CMake build system for Windows  
						
						 
						
						... 
						
						
						
						Add support for OPTION WITH_OPENCOLLADA for Windows 
						
						
					 
					
						2009-11-11 00:02:49 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						37e4a311b0 
					 
					
						
						
							
							Math Lib  
						
						 
						
						... 
						
						
						
						* Convert all code to use new functions.
* Branch maintainers may want to skip this commit, and run this
  conversion script instead, if they use a lot of math functions
  in new code:
  http://www.pasteall.org/9052/python  
						
						
					 
					
						2009-11-10 20:43:45 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ff0ba86a9b 
					 
					
						
						
							
							Mac :  
						
						 
						
						... 
						
						
						
						- scons update to build with openCollada
- scons & cmake update for render optimization cflags 
						
						
					 
					
						2009-11-09 17:52:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7b96bc00d5 
					 
					
						
						
							
							Merge -c 24393 (patch by Jan) from COLLADA branch.  
						
						 
						
						
						
						
					 
					
						2009-11-07 14:34:04 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b36c4f3987 
					 
					
						
						
							
							Merging change 24311 from COLLADA branch into trunk which should fix object-based rotation import/export. Bone rotation animation not fixed yet.  
						
						 
						
						
						
						
					 
					
						2009-11-04 15:25:57 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9ea97203ae 
					 
					
						
						
							
							Mac :  
						
						 
						
						... 
						
						
						
						- Updated CMake files for building with openCollada
Update of the 10.5 libs including openCollada is coming in next commit 
						
						
					 
					
						2009-11-02 14:03:13 +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