COLLADA branch: merge from trunk -r 25745:26429.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Sat, 30 Jan 2010 14:12:51 +0000 (14:12 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Sat, 30 Jan 2010 14:12:51 +0000 (14:12 +0000)
scons+vc build crashes on Blender start when BF_COLLADA is on, don't know why this happens.

Merging from trunk to get working vc project files, then will try to debug and locate the problem.

1  2 
CMake/macros.cmake
CMakeLists.txt
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/image.c
source/blender/collada/DocumentImporter.cpp
source/blender/windowmanager/intern/wm_operators.c
tools/Blender.py

Simple merge
diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge