[Bf-blender-cvs] [5bcb37c3b75] vr_scene_inspection: Cleanup: Rename zoom/dolly lock flag

[Julian Eisel]

Commit: 5bcb37c3b759624fecf80ce753b644fd14e4b4eb
Author: Julian Eisel
Date:   Wed Mar 11 20:59:27 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB5bcb37c3b759624fecf80ce753b644fd14e4b4eb

Cleanup: Rename zoom/dolly lock flag

===================================================================

M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/editors/space_view3d/view3d_gizmo_navigate.c
M	source/blender/makesdna/DNA_view3d_types.h

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index d8f7f8b2b6f..e59836271b4 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -126,7 +126,7 @@ static bool view3d_zoom_or_dolly_poll(bContext *C)
 {
   if (ED_operator_region_view3d_active(C)) {
     const RegionView3D *rv3d = CTX_wm_region_view3d(C);
-    return !(rv3d->viewlock & RV3D_LOCK_DOLLY);
+    return !(rv3d->viewlock & RV3D_LOCK_ZOOM_AND_DOLLY);
   }
   return false;
 }
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
index b3f52e328c6..b32d6c20204 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
@@ -305,7 +305,7 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g
 
   if (show_navigate) {
     int icon_mini_slot = 0;
-    if ((rv3d->viewlock & RV3D_LOCK_DOLLY) == 0) {
+    if ((rv3d->viewlock & RV3D_LOCK_ZOOM_AND_DOLLY) == 0) {
         gz = navgroup->gz_array[GZ_INDEX_ZOOM];
         gz->matrix_basis[3][0] = roundf(co[0]);
         gz->matrix_basis[3][1] = roundf(co[1] - (icon_offset_mini * icon_mini_slot++));
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index c2707c0d9ce..a179c170adb 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -373,13 +373,13 @@ enum {
   RV3D_BOXVIEW = (1 << 1),
   RV3D_BOXCLIP = (1 << 2),
   RV3D_LOCK_LOCATION = (1 << 3),
-  RV3D_LOCK_DOLLY = (1 << 4), /* Actually dolly and zoom. Could be split in two if needed. */
+  RV3D_LOCK_ZOOM_AND_DOLLY = (1 << 4),
 
   /* Make it clear that the transform lock flags should be runtime only, i.e. cleared on file
      read. */
   RV3D_LOCK_RUNTIME_ONLY = (1 << 5),
 
-  RV3D_LOCK_ANY_TRANSFORM = (RV3D_LOCK_LOCATION | RV3D_LOCK_ROTATION | RV3D_LOCK_DOLLY),
+  RV3D_LOCK_ANY_TRANSFORM = (RV3D_LOCK_LOCATION | RV3D_LOCK_ROTATION | RV3D_LOCK_ZOOM_AND_DOLLY),
 };
 
 /** #RegionView3D.viewlock_quad */