diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 05:39:57 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 05:39:57 +0400 |
commit | 705f23064e8ba3e96690d163c98687fc79d4a179 (patch) | |
tree | 13251a1f24cfb219a62c4f64c6750cadec7ff712 /source/blender/editors/object/object_transform.c | |
parent | 9e59fed5d8ff9f63477b3a73d2b02eaa55abd6cd (diff) | |
parent | dbdd1c2ea7496546f4f7e17350720a6005cdb187 (diff) |
svn merge ^/trunk/blender -r43294:43338
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 24061defa7c..68c017adecd 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, "center")) + if(v3d && !RNA_struct_property_is_set(op->ptr, "center")) around= v3d->around; } |