[Bf-blender-cvs] [b457cae3970] blender2.8: Cleanup: use variable names based on term gizmo

Campbell Barton noreply at git.blender.org
Sun Jul 15 14:36:17 CEST 2018


Commit: b457cae397054a1be4e60f3007995f97c198b2b6
Author: Campbell Barton
Date:   Sun Jul 15 14:24:10 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb457cae397054a1be4e60f3007995f97c198b2b6

Cleanup: use variable names based on term gizmo

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

M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M	release/scripts/templates_py/gizmo_custom_geometry.py
M	release/scripts/templates_py/gizmo_operator.py
M	release/scripts/templates_py/gizmo_operator_target.py
M	release/scripts/templates_py/gizmo_simple.py
M	source/blender/blenkernel/BKE_context.h
M	source/blender/blenkernel/intern/context.c
M	source/blender/draw/intern/draw_manager.c
M	source/blender/editors/gizmo_library/gizmo_library_intern.h
M	source/blender/editors/gizmo_library/gizmo_library_presets.c
M	source/blender/editors/gizmo_library/gizmo_library_utils.c
M	source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c
M	source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
M	source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
M	source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
M	source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
M	source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
M	source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
M	source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.c
M	source/blender/editors/include/ED_gizmo_library.h
M	source/blender/editors/include/ED_transform.h
M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/interface/interface_region_tooltip.c
M	source/blender/editors/mesh/editmesh_add_gizmo.c
M	source/blender/editors/mesh/editmesh_bevel.c
M	source/blender/editors/mesh/editmesh_bisect.c
M	source/blender/editors/mesh/editmesh_extrude.c
M	source/blender/editors/mesh/editmesh_extrude_spin.c
M	source/blender/editors/mesh/editmesh_inset.c
M	source/blender/editors/space_image/space_image.c
M	source/blender/editors/space_node/node_gizmo.c
M	source/blender/editors/space_node/node_intern.h
M	source/blender/editors/space_node/space_node.c
M	source/blender/editors/space_view3d/space_view3d.c
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/editors/space_view3d/view3d_gizmo_armature.c
M	source/blender/editors/space_view3d/view3d_gizmo_camera.c
M	source/blender/editors/space_view3d/view3d_gizmo_empty.c
M	source/blender/editors/space_view3d/view3d_gizmo_forcefield.c
M	source/blender/editors/space_view3d/view3d_gizmo_lamp.c
M	source/blender/editors/space_view3d/view3d_gizmo_navigate.c
M	source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
M	source/blender/editors/space_view3d/view3d_gizmo_ruler.c
M	source/blender/editors/space_view3d/view3d_intern.h
M	source/blender/editors/transform/transform.h
M	source/blender/editors/transform/transform_generics.c
M	source/blender/editors/transform/transform_gizmo_2d.c
M	source/blender/editors/transform/transform_gizmo_3d.c
M	source/blender/makesdna/DNA_view3d_types.h
M	source/blender/makesrna/intern/rna_space.c
M	source/blender/makesrna/intern/rna_wm_api.c
M	source/blender/makesrna/intern/rna_wm_gizmo.c
M	source/blender/makesrna/intern/rna_wm_gizmo_api.c
M	source/blender/python/intern/bpy_gizmo_wrap.c
M	source/blender/python/intern/bpy_gizmo_wrap.h
M	source/blender/python/intern/bpy_rna_gizmo.c
M	source/blender/windowmanager/gizmo/WM_gizmo_api.h
M	source/blender/windowmanager/gizmo/WM_gizmo_types.h
M	source/blender/windowmanager/gizmo/intern/wm_gizmo.c
M	source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
M	source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
M	source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
M	source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
M	source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
M	source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
M	source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
M	source/blender/windowmanager/intern/wm_event_system.c
M	source/blender/windowmanager/intern/wm_toolsystem.c

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index dbab7c7e037..eeb47595213 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -118,7 +118,7 @@ class _defs_view3d_generic:
         return dict(
             text="Ruler",
             icon="ops.view3d.ruler",
-            widget="VIEW3D_WGT_ruler",
+            widget="VIEW3D_GGT_ruler",
             keymap=(
                 ("view3d.ruler_add", dict(), dict(type='EVT_TWEAK_A', value='ANY')),
             ),
@@ -133,7 +133,7 @@ class _defs_transform:
             text="Grab",
             # cursor='SCROLL_XY',
             icon="ops.transform.translate",
-            widget="TRANSFORM_WGT_gizmo",
+            widget="TRANSFORM_GGT_gizmo",
             operator="transform.translate",
             # TODO, implement as optional fallback gizmo
             # keymap=(
@@ -147,7 +147,7 @@ class _defs_transform:
             text="Rotate",
             # cursor='SCROLL_XY',
             icon="ops.transform.rotate",
-            widget="TRANSFORM_WGT_gizmo",
+            widget="TRANSFORM_GGT_gizmo",
             operator="transform.rotate",
             # TODO, implement as optional fallback gizmo
             # keymap=(
@@ -161,7 +161,7 @@ class _defs_transform:
             text="Scale",
             # cursor='SCROLL_XY',
             icon="ops.transform.resize",
-            widget="TRANSFORM_WGT_gizmo",
+            widget="TRANSFORM_GGT_gizmo",
             operator="transform.resize",
             # TODO, implement as optional fallback gizmo
             # keymap=(
@@ -174,7 +174,7 @@ class _defs_transform:
         return dict(
             text="Scale Cage",
             icon="ops.transform.resize.cage",
-            widget="VIEW3D_WGT_xform_cage",
+            widget="VIEW3D_GGT_xform_cage",
             operator="transform.resize",
         )
 
@@ -187,7 +187,7 @@ class _defs_transform:
         return dict(
             text="Transform",
             icon="ops.transform.transform",
-            widget="TRANSFORM_WGT_gizmo",
+            widget="TRANSFORM_GGT_gizmo",
             # No keymap default action, only for gizmo!
             draw_settings=draw_settings,
         )
@@ -462,7 +462,7 @@ class _defs_edit_mesh:
         return dict(
             text="Extrude Region",
             icon="ops.mesh.extrude_region_move",
-            widget="MESH_WGT_extrude",
+            widget="MESH_GGT_extrude",
             operator="view3d.edit_mesh_extrude_move_normal",
             keymap=(
                 ("mesh.extrude_context_move", dict(TRANSFORM_OT_translate=dict(release_confirm=True)),
diff --git a/release/scripts/templates_py/gizmo_custom_geometry.py b/release/scripts/templates_py/gizmo_custom_geometry.py
index f71237f52f7..8125498fa85 100644
--- a/release/scripts/templates_py/gizmo_custom_geometry.py
+++ b/release/scripts/templates_py/gizmo_custom_geometry.py
@@ -63,7 +63,7 @@ custom_shape_verts = (
 
 
 class MyCustomShapeWidget(Gizmo):
-    bl_idname = "VIEW3D_WT_auto_facemap"
+    bl_idname = "VIEW3D_GT_auto_facemap"
     bl_target_properties = (
         {"id": "offset", "type": 'FLOAT', "array_length": 1},
     )
@@ -113,7 +113,7 @@ class MyCustomShapeWidget(Gizmo):
 
 
 class MyCustomShapeWidgetGroup(GizmoGroup):
-    bl_idname = "OBJECT_WGT_light_test"
+    bl_idname = "OBJECT_GGT_light_test"
     bl_label = "Test Light Widget"
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'WINDOW'
diff --git a/release/scripts/templates_py/gizmo_operator.py b/release/scripts/templates_py/gizmo_operator.py
index 3cbb0801e9c..bdc1bc9893c 100644
--- a/release/scripts/templates_py/gizmo_operator.py
+++ b/release/scripts/templates_py/gizmo_operator.py
@@ -80,7 +80,7 @@ class SelectSideOfPlane(Operator):
 
 # Gizmos for plane_co, plane_no
 class SelectSideOfPlaneGizmoGroup(GizmoGroup):
-    bl_idname = "MESH_WGT_select_side_of_plane"
+    bl_idname = "MESH_GGT_select_side_of_plane"
     bl_label = "Side of Plane Gizmo"
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'WINDOW'
@@ -126,7 +126,7 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
             # XXX, this may change!
             op.execute(context)
 
-        mpr = self.gizmos.new("GIZMO_WT_grab_3d")
+        mpr = self.gizmos.new("GIZMO_GT_grab_3d")
         mpr.target_set_handler("offset", get=grab_get_cb, set=grab_set_cb)
 
         mpr.use_draw_value = True
@@ -161,7 +161,7 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
             op.plane_no = no
             op.execute(context)
 
-        mpr = self.gizmos.new("GIZMO_WT_dial_3d")
+        mpr = self.gizmos.new("GIZMO_GT_dial_3d")
         mpr.target_set_handler("offset", get=direction_get_cb, set=direction_set_cb)
         mpr.draw_options = {'ANGLE_START_Y'}
 
diff --git a/release/scripts/templates_py/gizmo_operator_target.py b/release/scripts/templates_py/gizmo_operator_target.py
index 08fe63ef0b7..28465ad2fa5 100644
--- a/release/scripts/templates_py/gizmo_operator_target.py
+++ b/release/scripts/templates_py/gizmo_operator_target.py
@@ -10,7 +10,7 @@ from bpy.types import (
 
 
 class MyCameraWidgetGroup(GizmoGroup):
-    bl_idname = "OBJECT_WGT_test_camera"
+    bl_idname = "OBJECT_GGT_test_camera"
     bl_label = "Object Camera Test Widget"
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'WINDOW'
@@ -24,7 +24,7 @@ class MyCameraWidgetGroup(GizmoGroup):
     def setup(self, context):
         # Run an operator using the dial gizmo
         ob = context.object
-        mpr = self.gizmos.new("GIZMO_WT_dial_3d")
+        mpr = self.gizmos.new("GIZMO_GGT_dial_3d")
         props = mpr.target_set_operator("transform.rotate")
         props.constraint_axis = False, False, True
         props.constraint_orientation = 'LOCAL'
diff --git a/release/scripts/templates_py/gizmo_simple.py b/release/scripts/templates_py/gizmo_simple.py
index 0fd1e0b386b..df80acea0ae 100644
--- a/release/scripts/templates_py/gizmo_simple.py
+++ b/release/scripts/templates_py/gizmo_simple.py
@@ -11,7 +11,7 @@ from bpy.types import (
 
 
 class MyLightWidgetGroup(GizmoGroup):
-    bl_idname = "OBJECT_WGT_light_test"
+    bl_idname = "OBJECT_GGT_light_test"
     bl_label = "Test Light Widget"
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'WINDOW'
@@ -25,7 +25,7 @@ class MyLightWidgetGroup(GizmoGroup):
     def setup(self, context):
         # Arrow gizmo has one 'offset' property we can assign to the light energy.
         ob = context.object
-        mpr = self.gizmos.new("GIZMO_WT_arrow_3d")
+        mpr = self.gizmos.new("GIZMO_GGT_arrow_3d")
         mpr.target_set_prop("offset", ob.data, "energy")
         mpr.matrix_basis = ob.matrix_world.normalized()
         mpr.draw_style = 'BOX'
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 6703d828bf0..9f57859d318 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -185,7 +185,7 @@ void CTX_wm_screen_set(bContext *C, struct bScreen *screen); /* to be removed */
 void CTX_wm_area_set(bContext *C, struct ScrArea *sa);
 void CTX_wm_region_set(bContext *C, struct ARegion *region);
 void CTX_wm_menu_set(bContext *C, struct ARegion *menu);
-void CTX_wm_gizmo_group_set(bContext *C, struct wmGizmoGroup *mgroup);
+void CTX_wm_gizmo_group_set(bContext *C, struct wmGizmoGroup *gzgroup);
 const char *CTX_wm_operator_poll_msg_get(struct bContext *C);
 void CTX_wm_operator_poll_msg_set(struct bContext *C, const char *msg);
 
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 68a1e607517..3dfe9732062 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -876,9 +876,9 @@ void CTX_wm_menu_set(bContext *C, ARegion *menu)
 	C->wm.menu = menu;
 }
 
-void CTX_wm_gizmo_group_set(bContext *C, struct wmGizmoGroup *mgroup)
+void CTX_wm_gizmo_group_set(bContext *C, struct wmGizmoGroup *gzgroup)
 {
-	C->wm.gizmo_group = mgroup;
+	C->wm.gizmo_group = gzgroup;
 }
 
 void CTX_wm_operator_poll_msg_set(bContext *C, const char *msg)
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 98d6f167d30..a16d0bab104 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1440,7 +1440,7 @@ void DRW_draw_render_loop_ex(
 	if (DST.draw_ctx.evil_C) {
 		/* needed so gizmo isn't obscured */
 		if (((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) &&
-		    ((v3d->mpr_flag & V3D_GIZMO_HIDE) == 0))
+		    ((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0))
 		{
 			glDisable(GL_DEPTH_TEST);
 			DRW_draw_gizmo_3d();
diff --git a/source/blender/editors/gizmo_library/gizmo_library_intern.h b/source/blender/editors/gizmo_library/gizmo_library_intern.h
index f1689ee93db..f5584d86847 100644
--- a/source/blender/editors/gizmo_library/gizmo_library_intern.h
+++ b/source/blender/editors/gizmo_library/gizmo_library_intern.h
@@ -76,25 +76,25 @@ float gizmo_value_from_offset(
         const bool constrained, const bool inverted, const bool use_precision);
 
 void gizmo_property_data_update(
-        struct wmGizmo *mpr, GizmoCommonData *data, wmGizmoProperty *mpr_prop,
+        struct wmGizmo *gz, GizmoCommonData *data, wmGizmoProperty *gz_prop,
         const bool constrained, const bool inverted);
 
 void  gizmo_property_value_reset(
-        bContext *C, const struct wmGizmo *mpr, GizmoInteraction *inter, wmGizmoProperty *mpr_prop);
+        bContext *C, const struct wmGizmo *gz, GizmoInteraction *inter, wmGizmoProperty *gz_prop);
 
 
 /* -------------------------------------------------------------------- */
 
 void gizmo_color_get(
-        const struct wmGizmo *mpr, const bool highlight,
+        const struct wmGizmo *gz, const bool highlight,
         float r_color[4]);
 
 bool gizmo_window_project_2d(
-        bContext *C, const struct wmGizmo *mpr, const float mval[2], int axis, bool use_offset,
+        bContext *C, const struct wmGizmo *gz, const float mval[2], int axis, bool use_offset,
         float r_co[2]);
 
 bool gizmo_w

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list