svn merge ^/trunk/blender -r43124:43160
authorCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jan 2012 11:23:24 +0000 (11:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jan 2012 11:23:24 +0000 (11:23 +0000)
commit348f116fe574ee38a70e8c9bdff7fc62ad1ec2e8
tree1052824afb1efc07da2e17ade92ee1a6ae16cf4a
parent67db64bf818f9cc1dddbcef9dbb7213422d82feb
parent7f555daa64d5e80f8d9dd2acf592d18dc8986309
svn merge ^/trunk/blender -r43124:43160
CMakeLists.txt
source/blender/blenkernel/intern/constraint.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_edit.c
source/creator/creator.c