[Bf-blender-cvs] [217fddcb8eb] master: Cleanup: strict naming conventions

Campbell Barton noreply at git.blender.org
Thu Aug 31 16:54:38 CEST 2017


Commit: 217fddcb8ebe5ee6d3e311bb757d113b517850e6
Author: Campbell Barton
Date:   Fri Sep 1 00:57:36 2017 +1000
Branches: master
https://developer.blender.org/rB217fddcb8ebe5ee6d3e311bb757d113b517850e6

Cleanup: strict naming conventions

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

M	release/scripts/startup/bl_ui/properties_data_armature.py
M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/space_image.py

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

diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py
index ae52ab916f1..6a13e2ddd44 100644
--- a/release/scripts/startup/bl_ui/properties_data_armature.py
+++ b/release/scripts/startup/bl_ui/properties_data_armature.py
@@ -96,7 +96,7 @@ class DATA_PT_display(ArmatureButtonsPanel, Panel):
         col.prop(arm, "use_deform_delay", text="Delay Refresh")
 
 
-class DATA_PT_bone_group_specials(Menu):
+class DATA_MT_bone_group_specials(Menu):
     bl_label = "Bone Group Specials"
 
     def draw(self, context):
@@ -130,7 +130,7 @@ class DATA_PT_bone_groups(ArmatureButtonsPanel, Panel):
         col.active = (ob.proxy is None)
         col.operator("pose.group_add", icon='ZOOMIN', text="")
         col.operator("pose.group_remove", icon='ZOOMOUT', text="")
-        col.menu("DATA_PT_bone_group_specials", icon='DOWNARROW_HLT', text="")
+        col.menu("DATA_MT_bone_group_specials", icon='DOWNARROW_HLT', text="")
         if group:
             col.separator()
             col.operator("pose.group_move", icon='TRIA_UP', text="").direction = 'UP'
@@ -337,7 +337,7 @@ classes = (
     DATA_PT_context_arm,
     DATA_PT_skeleton,
     DATA_PT_display,
-    DATA_PT_bone_group_specials,
+    DATA_MT_bone_group_specials,
     DATA_PT_bone_groups,
     DATA_PT_pose_library,
     DATA_PT_ghost,
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 52835a00796..3795abff93c 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -463,7 +463,7 @@ class GreasePencilBrushCurvesPanel:
 
 ###############################
 
-class GPENCIL_PIE_tool_palette(Menu):
+class GPENCIL_MT_pie_tool_palette(Menu):
     """A pie menu for quick access to Grease Pencil tools"""
     bl_label = "Grease Pencil Tools"
 
@@ -487,7 +487,7 @@ class GPENCIL_PIE_tool_palette(Menu):
         # E - "Settings" Palette is included here too, since it needs to be in a stable position...
         if gpd and gpd.layers.active:
             col.separator()
-            col.operator("wm.call_menu_pie", text="Settings...", icon='SCRIPTWIN').name = "GPENCIL_PIE_settings_palette"
+            col.operator("wm.call_menu_pie", text="Settings...", icon='SCRIPTWIN').name = "GPENCIL_MT_pie_settings_palette"
 
         # Editing tools
         if gpd:
@@ -525,13 +525,13 @@ class GPENCIL_PIE_tool_palette(Menu):
                 col.operator("gpencil.delete", icon='X', text="Delete...")
 
                 # SE - More Tools
-                pie.operator("wm.call_menu_pie", text="More...").name = "GPENCIL_PIE_tools_more"
+                pie.operator("wm.call_menu_pie", text="More...").name = "GPENCIL_MT_pie_tools_more"
             else:
                 # Toggle Edit Mode
                 pie.operator("gpencil.editmode_toggle", text="Enable Stroke Editing", icon='EDIT')
 
 
-class GPENCIL_PIE_settings_palette(Menu):
+class GPENCIL_MT_pie_settings_palette(Menu):
     """A pie menu for quick access to Grease Pencil settings"""
     bl_label = "Grease Pencil Settings"
 
@@ -614,7 +614,7 @@ class GPENCIL_PIE_settings_palette(Menu):
             col.prop(gpd, "show_stroke_direction", text="Show drawing direction")
 
 
-class GPENCIL_PIE_tools_more(Menu):
+class GPENCIL_MT_pie_tools_more(Menu):
     """A pie menu for accessing more Grease Pencil tools"""
     bl_label = "More Grease Pencil Tools"
 
@@ -643,10 +643,10 @@ class GPENCIL_PIE_tools_more(Menu):
         pie.operator("transform.tosphere", icon='MOD_MULTIRES')
 
         pie.operator("gpencil.convert", icon='OUTLINER_OB_CURVE', text="Convert...")
-        pie.operator("wm.call_menu_pie", text="Back to Main Palette...").name = "GPENCIL_PIE_tool_palette"
+        pie.operator("wm.call_menu_pie", text="Back to Main Palette...").name = "GPENCIL_MT_pie_tool_palette"
 
 
-class GPENCIL_PIE_sculpt(Menu):
+class GPENCIL_MT_pie_sculpt(Menu):
     """A pie menu for accessing Grease Pencil stroke sculpting settings"""
     bl_label = "Grease Pencil Sculpt"
 
@@ -1158,10 +1158,10 @@ class GreasePencilToolsPanel:
 
 
 classes = (
-    GPENCIL_PIE_tool_palette,
-    GPENCIL_PIE_settings_palette,
-    GPENCIL_PIE_tools_more,
-    GPENCIL_PIE_sculpt,
+    GPENCIL_MT_pie_tool_palette,
+    GPENCIL_MT_pie_settings_palette,
+    GPENCIL_MT_pie_tools_more,
+    GPENCIL_MT_pie_sculpt,
     GPENCIL_MT_snap,
     GPENCIL_MT_gpencil_edit_specials,
     GPENCIL_UL_brush,
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index f070161f3da..340a6c807df 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -1086,7 +1086,7 @@ class IMAGE_PT_tools_paint_options(BrushButtonsPanel, Panel):
         col.prop(ups, "use_unified_color", text="Color")
 
 
-class IMAGE_UV_sculpt_curve(Panel):
+class IMAGE_PT_uv_sculpt_curve(Panel):
     bl_space_type = 'IMAGE_EDITOR'
     bl_region_type = 'TOOLS'
     bl_label = "UV Sculpt Curve"
@@ -1117,7 +1117,7 @@ class IMAGE_UV_sculpt_curve(Panel):
         row.operator("brush.curve_preset", icon='NOCURVE', text="").shape = 'MAX'
 
 
-class IMAGE_UV_sculpt(Panel, ImagePaintPanel):
+class IMAGE_PT_uv_sculpt(Panel, ImagePaintPanel):
     bl_space_type = 'IMAGE_EDITOR'
     bl_region_type = 'TOOLS'
     bl_category = "Tools"
@@ -1370,8 +1370,8 @@ classes = (
     IMAGE_PT_tools_imagepaint_symmetry,
     IMAGE_PT_tools_brush_appearance,
     IMAGE_PT_tools_paint_options,
-    IMAGE_UV_sculpt,
-    IMAGE_UV_sculpt_curve,
+    IMAGE_PT_uv_sculpt,
+    IMAGE_PT_uv_sculpt_curve,
     IMAGE_PT_view_histogram,
     IMAGE_PT_view_waveform,
     IMAGE_PT_view_vectorscope,



More information about the Bf-blender-cvs mailing list