Commit: 4311de9d86eaeaf24d06569640b403e0bd9944aa
Author: Joshua Leung
Date: Fri Nov 3 14:57:38 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB4311de9d86eaeaf24d06569640b403e0bd9944aa
Fix UI breakage (GP Modifiers / 3D View header) after ob->gpd --> ob->data
refactor
===================================================================
M release/scripts/startup/bl_ui/properties_data_modifier.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/makesrna/intern/rna_gpencil.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py
b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 52c0f7d749b..910b83fde70 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1559,7 +1559,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label("Layer:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="",
icon="GREASEPENCIL")
+ row.prop_search(md, "layer", gpd, "layers", text="",
icon='GREASEPENCIL')
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
col.label("Vertex Group:")
@@ -1593,7 +1593,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label("Layer:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="",
icon="GREASEPENCIL")
+ row.prop_search(md, "layer", gpd, "layers", text="",
icon='GREASEPENCIL')
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
def GP_SIMPLIFY(self, layout, ob, md):
@@ -1610,7 +1610,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label("Layer:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="",
icon="GREASEPENCIL")
+ row.prop_search(md, "layer", gpd, "layers", text="",
icon='GREASEPENCIL')
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
def GP_THICK(self, layout, ob, md):
@@ -1627,7 +1627,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label("Layer:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="",
icon="GREASEPENCIL")
+ row.prop_search(md, "layer", gpd, "layers", text="",
icon='GREASEPENCIL')
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
col.label("Vertex Group:")
@@ -1653,7 +1653,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label("Layer:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="",
icon="GREASEPENCIL")
+ row.prop_search(md, "layer", gpd, "layers", text="",
icon='GREASEPENCIL')
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
row = col.row(align=True)
row.prop(md, "pass_index", text="Pass")
@@ -1675,7 +1675,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label("Layer:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="",
icon="GREASEPENCIL")
+ row.prop_search(md, "layer", gpd, "layers", text="",
icon='GREASEPENCIL')
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
row = col.row(align=True)
row.prop(md, "pass_index", text="Pass")
@@ -1695,7 +1695,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label("Layer:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="",
icon="GREASEPENCIL")
+ row.prop_search(md, "layer", gpd, "layers", text="",
icon='GREASEPENCIL')
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
col.label("Vertex Group:")
@@ -1708,6 +1708,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop(md, "inverse_pass", text="", icon="ARROW_LEFTRIGHT")
def GP_ARRAY(self, layout, ob, md):
+ gpd = ob.data
+
split = layout.split()
col = split.column()
col.prop(md, "count")
@@ -1745,7 +1747,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label("Layer:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="",
icon="GREASEPENCIL")
+ row.prop_search(md, "layer", gpd, "layers", text="",
icon='GREASEPENCIL')
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
row = col.row(align=True)
row.prop(md, "pass_index", text="Pass")
@@ -1765,7 +1767,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label("Layer:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="",
icon="GREASEPENCIL")
+ row.prop_search(md, "layer", gpd, "layers", text="",
icon='GREASEPENCIL')
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
row = col.row(align=True)
row.prop(md, "pass_index", text="Pass")
@@ -1800,7 +1802,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label("Layer:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="",
icon="GREASEPENCIL")
+ row.prop_search(md, "layer", gpd, "layers", text="",
icon='GREASEPENCIL')
row.prop(md, "inverse_layers", text="", icon="ARROW_LEFTRIGHT")
col.label("Vertex Group:")
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 4f878e1dbfc..495a14f2096 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -130,9 +130,11 @@ class VIEW3D_HT_header(Header):
row.operator("pose.paste", text="", icon='PASTEFLIPDOWN').flipped
= True
# GPencil
- if context.active_object and context.active_object.type == 'GPENCIL':
+ if context.active_object and context.gpencil_data and
context.active_object.type == 'GPENCIL':
ob = context.active_object
- if ob.grease_pencil.is_stroke_paint_mode:
+ gpd = context.gpencil_data
+
+ if gpd.is_stroke_paint_mode:
row.separator()
row.prop(toolsettings, "gpencil_stroke_placement_view3d",
text='')
if toolsettings.gpencil_stroke_placement_view3d in('ORIGIN',
'CURSOR'):
@@ -142,20 +144,17 @@ class VIEW3D_HT_header(Header):
if toolsettings.gpencil_stroke_placement_view3d in ('SURFACE',
'STROKE'):
row.prop(toolsettings, "use_gpencil_stroke_endpoints")
- if ob.grease_pencil.is_stroke_sculpt_mode:
+ if gpd.is_stroke_sculpt_mode:
settings = context.tool_settings.gpencil_sculpt
if settings.tool in ('GRAB', 'PUSH', 'TWIST', 'PINCH',
'RANDOMIZE'):
row.separator()
row.prop(toolsettings.gpencil_sculpt, "lockaxis", text='')
- gpd = context.gpencil_data
- if gpd:
if gpd.use_stroke_edit_mode:
row = layout.row(align=True)
row.operator("gpencil.copy", text="", icon='COPYDOWN')
row.operator("gpencil.paste", text="", icon='PASTEDOWN')
- # XXX: icon
layout.prop(gpd, "use_onion_skinning", text="Onion Skins",
icon='PARTICLE_PATH')
if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode:
diff --git a/source/blender/makesrna/intern/rna_gpencil.c
b/source/blender/makesrna/intern/rna_gpencil.c
index 11affa6eff9..24fc96e49b6 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1442,7 +1442,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
prop = RNA_def_property(srna, "is_stroke_paint_mode", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag",
GP_DATA_STROKE_PAINTMODE);
- RNA_def_property_ui_text(prop, "Stroke Paint Mode", "Paint Grease
Pencil strokes instead of viewport data");
+ RNA_def_property_ui_text(prop, "Stroke Paint Mode", "Draw Grease Pencil
strokes on click/drag");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA |
ND_GPENCIL_EDITMODE, "rna_GPencil_editmode_update");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
