[Bf-blender-cvs] [77222d04300] greasepencil-object: GPencil: Cleanup spaces
Antonio Vazquez
noreply at git.blender.org
Sat Nov 23 13:05:41 CET 2019
Commit: 77222d043007018dc8de61b1f8948b210f58b341
Author: Antonio Vazquez
Date: Sat Nov 23 13:05:22 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB77222d043007018dc8de61b1f8948b210f58b341
GPencil: Cleanup spaces
===================================================================
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_view3d.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 74cfd59bfaa..d00790dc2fe 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1620,7 +1620,7 @@ class _defs_gpencil_weight:
class _defs_gpencil_vertex:
-
+
@staticmethod
def poll_select_mask(context):
if context is None:
@@ -1630,7 +1630,7 @@ class _defs_gpencil_vertex:
return ob and ob.type == 'GPENCIL' and (ts.use_gpencil_vertex_select_mask_point or
ts.use_gpencil_vertex_select_mask_stroke or
ts.use_gpencil_vertex_select_mask_segment)
-
+
@staticmethod
def generate_from_brushes(context):
return generate_from_enum_ex(
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index fd675366d8b..09d03853dcb 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -448,7 +448,7 @@ class _draw_tool_settings_context_mode:
if brush.gpencil_vertex_tool not in {'BLUR', 'AVERAGE', 'SMEAR'}:
row.separator(factor=0.4)
row.prop(brush, "color", text="")
-
+
row.popover(
panel="TOPBAR_PT_gpencil_vertexcolor",
text="Vertex Color",
@@ -799,7 +799,7 @@ class VIEW3D_MT_editor_menus(Menu):
obj = context.active_object
mode_string = context.mode
edit_object = context.edit_object
- gp_edit = obj and obj.mode in {'EDIT_GPENCIL', 'PAINT_GPENCIL', 'SCULPT_GPENCIL',
+ gp_edit = obj and obj.mode in {'EDIT_GPENCIL', 'PAINT_GPENCIL', 'SCULPT_GPENCIL',
'WEIGHT_GPENCIL', 'VERTEX_GPENCIL'}
ts = context.scene.tool_settings
@@ -2792,7 +2792,7 @@ class VIEW3D_MT_join_palette(Menu):
def poll(cls, context):
if bpy.data.palettes > 1:
return True
-
+
return False
def draw(self, context):
More information about the Bf-blender-cvs
mailing list