[Bf-blender-cvs] [df1cf4af94a] greasepencil-object: Cleanup: Variable Naming

Joshua Leung noreply at git.blender.org
Tue Jul 3 07:28:12 CEST 2018


Commit: df1cf4af94a7070963de99f5d6ff4aea5c517000
Author: Joshua Leung
Date:   Tue Jul 3 16:22:12 2018 +1200
Branches: greasepencil-object
https://developer.blender.org/rBdf1cf4af94a7070963de99f5d6ff4aea5c517000

Cleanup: Variable Naming

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

M	release/scripts/startup/bl_ui/space_view3d.py

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index b731d5cf4c3..d99ab3ecadd 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -79,7 +79,8 @@ class VIEW3D_HT_header(Header):
 
         # Grease Pencil
         # GPXX this is a hack while we merge to keep all running
-        if context.active_object and context.gpencil_data and context.active_object.type == 'GPENCIL':
+        # XXX: Should these buttons show up in Object Mode at all?
+        if obj and obj.type == 'GPENCIL' and context.gpencil_data:
             gpd = context.gpencil_data
 
             if gpd.is_stroke_paint_mode:
@@ -106,7 +107,7 @@ class VIEW3D_HT_header(Header):
                 sub.popover(
                     space_type='VIEW_3D',
                     region_type='HEADER',
-                    panel_type="VIEW3D_PT_GreasePencilMultiFrame",
+                    panel_type="VIEw3D_PT_gpencil_multi_frame",
                     text="Multiframe"
                 )
 
@@ -4268,9 +4269,8 @@ class VIEW3D_PT_context_properties(Panel):
             rna_prop_ui.draw(self.layout, context, member, object, False)
 
 
-# Grease Pencil multiframe falloff tools
-# FIXME: Name breaks conventions
-class VIEW3D_PT_GreasePencilMultiFrame(Panel):
+# Grease Pencil Object - Multiframe falloff tools
+class VIEw3D_PT_gpencil_multi_frame(Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'HEADER'
     bl_label = "Multi Frame"
@@ -4426,7 +4426,7 @@ classes = (
     VIEW3D_PT_view3d_cursor,
     VIEW3D_PT_grease_pencil,
     VIEW3D_PT_gp_paper,
-    VIEW3D_PT_GreasePencilMultiFrame,
+    VIEw3D_PT_gpencil_multi_frame,
     VIEW3D_PT_quad_view,
     VIEW3D_PT_view3d_stereo,
     VIEW3D_PT_shading,



More information about the Bf-blender-cvs mailing list