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)
commit1f863d0122b37d99a49383e7695d1a0c47a0b114
treec97feebfa202b4d1cfabedd849d070888fd58af7
parent669533437778339e293c8b2bfefa32166a6cc708
parent7a76bc9a361e6cb45e4292c0ac5c7bb08936b829
COLLADA branch: merge from trunk -r 25745:26429.

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.
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