Merging with trunk up to r38631.
authorJoerg Mueller <nexyon@gmail.com>
Sat, 23 Jul 2011 16:34:30 +0000 (16:34 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Sat, 23 Jul 2011 16:34:30 +0000 (16:34 +0000)
commit682cc631613dd8dcdcfec30246e191cec93f4006
tree520a45f1db7d2607299bab35b673df9c30668b70
parent1193be6eaadc47ef708a521ee883cb12a4650131
parentf4a30e473b23425c13a755854cf7b22c22cca259
Merging with trunk up to r38631.
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/gameengine/Expressions/PyObjectPlus.h