diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 14:38:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 14:38:44 +0400 |
| commit | e936c78251de5bafa99439803ab4fd2caa4df3b2 (patch) | |
| tree | 51ccdc2efbab74903cb7b428619726832c3b1ab4 /source/blender/editors/object/object_transform.c | |
| parent | 735ab2b22d865570a4585e7088e66a45030ddf2d (diff) | |
| parent | b18e661ffcd39b97ac0c8295d778a1cb31339ed8 (diff) | |
svn merge ^/trunk/blender -r41503:41575
Diffstat (limited to 'source/blender/editors/object/object_transform.c')
| -rw-r--r-- | source/blender/editors/object/object_transform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 0d080c7ea01..d60b7b31bf4 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -646,7 +646,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) /* get the view settings if 'around' isnt set and the view is available */ View3D *v3d= CTX_wm_view3d(C); copy_v3_v3(cursor, give_cursor(scene, v3d)); - if(v3d && !RNA_property_is_set(op->ptr, "around")) + if(v3d && !RNA_property_is_set(op->ptr, "center")) around= v3d->around; } |