Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for OpenCollada...
authorArystanbek Dyussenov <arystan.d@gmail.com>
Sun, 29 Nov 2009 19:16:52 +0000 (19:16 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Sun, 29 Nov 2009 19:16:52 +0000 (19:16 +0000)
commit92b4316708bad0448f4c433ef9c6c2d3cc1f4fb5
tree5b00bbd7dd2f8d08affce8ad7d5688f5b786cde4
parentedf32a6fb0213bf35748890dfbc84b20d384298e
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.
CMakeLists.txt
config/linux2-config.py
source/blender/blenkernel/BKE_texture.h
source/blender/blenkernel/intern/texture.c
source/blender/blenlib/BLI_util.h
source/blender/blenlib/intern/util.c
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/collada/collada_internal.h