[Bf-blender-cvs] [e94ec793417] master: Cleanup: use view3d_navigate prefix for walk/fly operators

Campbell Barton noreply at git.blender.org
Mon Jun 28 08:14:47 CEST 2021


Commit: e94ec7934173548f22bf1af24c16c301a777526b
Author: Campbell Barton
Date:   Mon Jun 28 16:06:38 2021 +1000
Branches: master
https://developer.blender.org/rBe94ec7934173548f22bf1af24c16c301a777526b

Cleanup: use view3d_navigate prefix for walk/fly operators

Use matching file-name prefix as these operators are closely related.

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

M	source/blender/editors/space_view3d/CMakeLists.txt
M	source/blender/editors/space_view3d/view3d_intern.h
R099	source/blender/editors/space_view3d/view3d_fly.c	source/blender/editors/space_view3d/view3d_navigate_fly.c
R099	source/blender/editors/space_view3d/view3d_walk.c	source/blender/editors/space_view3d/view3d_navigate_walk.c

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

diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index 9242fc15021..fe84a3b8ae9 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -46,7 +46,6 @@ set(SRC
   view3d_camera_control.c
   view3d_draw.c
   view3d_edit.c
-  view3d_fly.c
   view3d_gizmo_armature.c
   view3d_gizmo_camera.c
   view3d_gizmo_empty.c
@@ -60,6 +59,8 @@ set(SRC
   view3d_gizmo_tool_generic.c
   view3d_header.c
   view3d_iterators.c
+  view3d_navigate_fly.c
+  view3d_navigate_walk.c
   view3d_ops.c
   view3d_placement.c
   view3d_project.c
@@ -67,7 +68,6 @@ set(SRC
   view3d_snap.c
   view3d_utils.c
   view3d_view.c
-  view3d_walk.c
 
   view3d_intern.h
 )
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index 0964c2dcbcc..ab80928e0c1 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -111,11 +111,11 @@ void view3d_ndof_fly(const struct wmNDOFMotionData *ndof,
                      bool *r_has_rotate);
 #endif /* WITH_INPUT_NDOF */
 
-/* view3d_fly.c */
+/* view3d_navigate_fly.c */
 void view3d_keymap(struct wmKeyConfig *keyconf);
 void VIEW3D_OT_fly(struct wmOperatorType *ot);
 
-/* view3d_walk.c */
+/* view3d_navigate_walk.c */
 void VIEW3D_OT_walk(struct wmOperatorType *ot);
 
 /* view3d_draw.c */
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_navigate_fly.c
similarity index 99%
rename from source/blender/editors/space_view3d/view3d_fly.c
rename to source/blender/editors/space_view3d/view3d_navigate_fly.c
index 3347de73d01..fd4fd5051b1 100644
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_navigate_fly.c
@@ -19,7 +19,7 @@
  *
  * Interactive fly navigation modal operator (flying around in space).
  *
- * \note Similar logic to `view3d_walk.c` changes here may apply there too.
+ * \note Similar logic to `view3d_navigate_walk.c` changes here may apply there too.
  */
 
 /* defines VIEW3D_OT_fly modal operator */
diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_navigate_walk.c
similarity index 99%
rename from source/blender/editors/space_view3d/view3d_walk.c
rename to source/blender/editors/space_view3d/view3d_navigate_walk.c
index 370ed7d12cf..33cb6aad400 100644
--- a/source/blender/editors/space_view3d/view3d_walk.c
+++ b/source/blender/editors/space_view3d/view3d_navigate_walk.c
@@ -20,7 +20,7 @@
  * Interactive walk navigation modal operator
  * (similar to walking around in a first person game).
  *
- * \note Similar logic to `view3d_fly.c` changes here may apply there too.
+ * \note Similar logic to `view3d_navigate_fly.c` changes here may apply there too.
  */
 
 /* defines VIEW3D_OT_navigate - walk modal operator */



More information about the Bf-blender-cvs mailing list