diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-19 14:54:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-19 14:54:07 +0400 |
| commit | 78f393f0c3789221603cde786b66b04bcf164594 (patch) | |
| tree | 8188e195f3ab7d7c29a0d36b6135013812468218 /source/blender/editors/space_view3d/view3d_edit.c | |
| parent | 1f40c0ffa71f07d75c4aecccf33c8a0cbf5e085a (diff) | |
| parent | 5f341a846b78df701686a56da7caf61c087a716f (diff) | |
svn merge ^/trunk/blender -r49750:49800
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 154c41b7fc1..74e0d9ad310 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -439,7 +439,7 @@ static void viewops_data_create(bContext *C, wmOperator *op, wmEvent *event) calculateTransformCenter(C, V3D_CENTROID, lastofs, NULL); negate_v3_v3(vod->dyn_ofs, lastofs); } - else if (U.uiflag & USER_ORBIT_ZBUF) { + else if (U.uiflag & USER_ZBUF_ORBIT) { view3d_operator_needs_opengl(C); /* needed for zbuf drawing */ @@ -2743,7 +2743,7 @@ static int view3d_zoom_border_invoke(bContext *C, wmOperator *op, wmEvent *event void VIEW3D_OT_zoom_border(wmOperatorType *ot) { /* identifiers */ - ot->name = "Border Zoom"; + ot->name = "Zoom to Border"; ot->description = "Zoom in the view to the nearest object contained in the border"; ot->idname = "VIEW3D_OT_zoom_border"; @@ -3460,7 +3460,7 @@ static int set_3dcursor_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *eve if (mval[0] != IS_CLIPPED) { short depth_used = 0; - if (U.uiflag & USER_ORBIT_ZBUF) { /* maybe this should be accessed some other way */ + if (U.uiflag & USER_ZBUF_CURSOR) { /* maybe this should be accessed some other way */ view3d_operator_needs_opengl(C); if (ED_view3d_autodist(scene, ar, v3d, event->mval, fp)) depth_used = 1; |