Merge with trunk r37677
authorJoerg Mueller <nexyon@gmail.com>
Mon, 20 Jun 2011 22:55:18 +0000 (22:55 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Mon, 20 Jun 2011 22:55:18 +0000 (22:55 +0000)
commit207911bdb3e5ba3e110cc7107186af988d2d10e8
tree88684071e2813d52f8dc700b593d7644b2be88c8
parentadb81a0351c0854ee8529ae7a66ef9c907790ee5
parent768184753abb5a69e278bfe6207fe070b2e0ffc7
Merge with trunk r37677
20 files changed:
release/scripts/modules/bpy_types.py
release/scripts/startup/bl_operators/nla.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenloader/intern/readfile.c
source/blender/collada/AnimationImporter.cpp
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/CMakeLists.txt
source/blender/collada/DocumentImporter.cpp
source/blender/collada/SkinInfo.cpp
source/blender/editors/interface/resources.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_userdef.c
source/gameengine/Converter/BL_ActionActuator.cpp