diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-05 22:53:09 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-05 22:53:09 +0400 |
commit | f55f9e95db44838130a18f80b33bd77f58e8a987 (patch) | |
tree | 502ddd00634c4ec1a2098337f4ec1f524bfc4a73 /source/blender/editors/transform | |
parent | 9e51f4b94368a612c5561f20f4b44f858ab5318e (diff) | |
parent | c40d8921b8b61c0465a2fe9bca72dc418bf39c7d (diff) |
Merging r42413 through r42441 form trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 72f10a532d7..d0857958a4b 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1552,7 +1552,7 @@ void calculateCenter(TransInfo *t) if(t->obedit->type == OB_MESH) { EditSelection ese; EditMesh *em = BKE_mesh_get_editmesh(t->obedit->data); - + if (EM_get_actSelection(em, &ese)) { EM_editselection_center(t->center, &ese); calculateCenter2D(t); @@ -1570,7 +1570,7 @@ void calculateCenter(TransInfo *t) } } } /* END EDIT MODE ACTIVE ELEMENT */ - + calculateCenterMedian(t); if((t->flag & (T_EDIT|T_POSE))==0) { |