[Bf-blender-cvs] [735d6cb8d87] blender2.8: GP: Add new Layer Pass Index filter to modifiers
Antonioya
noreply at git.blender.org
Wed Oct 24 16:46:46 CEST 2018
Commit: 735d6cb8d87cc3bb8ba9a727b95480502dd0f2b1
Author: Antonioya
Date: Wed Oct 24 16:46:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB735d6cb8d87cc3bb8ba9a727b95480502dd0f2b1
GP: Add new Layer Pass Index filter to modifiers
Now the modifier can be filtered using the new layer index.
Also changed panels to put layers and passes filter always at the end of the panel.
===================================================================
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
M source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesrna/intern/rna_gpencil_modifier.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 36a5c91f44d..0196a61b2b4 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1638,59 +1638,65 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
col.prop(md, "full_stroke")
col.prop(md, "move_extreme")
- col = split.column()
- col.label(text="Layer:")
- row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL')
- row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT')
+ row = layout.row(align=True)
+ row.label(text="Affect:")
+ row = layout.row(align=True)
+ row.prop(md, "use_edit_position", text="Position", icon='MESH_DATA', toggle=True)
+ row.prop(md, "use_edit_strength", text="Strength", icon='COLOR', toggle=True)
+ row.prop(md, "use_edit_thickness", text="Thickness", icon='LINE_DATA', toggle=True)
+ row.prop(md, "use_edit_uv", text="UV", icon='MOD_UVPROJECT', toggle=True)
+ col = layout.column()
+ col.separator()
col.label(text="Vertex Group:")
row = col.row(align=True)
row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT')
+ col.label(text="Material:")
row = col.row(align=True)
row.prop(md, "pass_index", text="Pass")
- row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT')
+ row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT')
+ col.label(text="Layer:")
+ row = col.row(align=True)
+ row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL')
+ row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT')
row = layout.row(align=True)
- row.label(text="Affect:")
- row = layout.row(align=True)
- row.prop(md, "use_edit_position", text="Position", icon='MESH_DATA', toggle=True)
- row.prop(md, "use_edit_strength", text="Strength", icon='COLOR', toggle=True)
- row.prop(md, "use_edit_thickness", text="Thickness", icon='LINE_DATA', toggle=True)
- row.prop(md, "use_edit_uv", text="UV", icon='MOD_UVPROJECT', toggle=True)
+ row.prop(md, "layer_pass", text="Pass")
+ row.prop(md, "invert_layer_pass", text="", icon='ARROW_LEFTRIGHT')
def GP_SMOOTH(self, layout, ob, md):
gpd = ob.data
- row = layout.row(align=False)
- row.prop(md, "factor")
- row.prop(md, "step")
+ col = layout.column()
+ col.prop(md, "factor")
+ col.prop(md, "step")
- split = layout.split()
- col = split.column()
- col.label(text="Layer:")
+ col.label(text="Affect:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL')
- row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT')
+ row.prop(md, "use_edit_position", text="Position", icon='MESH_DATA', toggle=True)
+ row.prop(md, "use_edit_strength", text="Strength", icon='COLOR', toggle=True)
+ row.prop(md, "use_edit_thickness", text="Thickness", icon='LINE_DATA', toggle=True)
+ row.prop(md, "use_edit_uv", text="UV", icon='MOD_UVPROJECT', toggle=True)
- col = split.column()
+ col.separator()
col.label(text="Vertex Group:")
row = col.row(align=True)
row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT')
+ col.label(text="Material:")
row = col.row(align=True)
row.prop(md, "pass_index", text="Pass")
- row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT')
+ row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT')
+ col.label(text="Layer:")
+ row = col.row(align=True)
+ row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL')
+ row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT')
row = layout.row(align=True)
- row.label(text="Affect:")
- row = layout.row(align=True)
- row.prop(md, "use_edit_position", text="Position", icon='MESH_DATA', toggle=True)
- row.prop(md, "use_edit_strength", text="Strength", icon='COLOR', toggle=True)
- row.prop(md, "use_edit_thickness", text="Thickness", icon='LINE_DATA', toggle=True)
- row.prop(md, "use_edit_uv", text="UV", icon='MOD_UVPROJECT', toggle=True)
+ row.prop(md, "layer_pass", text="Pass")
+ row.prop(md, "invert_layer_pass", text="", icon='ARROW_LEFTRIGHT')
def GP_SUBDIV(self, layout, ob, md):
gpd = ob.data
@@ -1700,15 +1706,21 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
row = col.row(align=True)
row.prop(md, "level")
row.prop(md, "simple", text="", icon='PARTICLE_POINT')
+
+ col = layout.column()
+ col.separator()
+ col.label(text="Material:")
row = col.row(align=True)
row.prop(md, "pass_index", text="Pass")
- row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT')
+ row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT')
- col = split.column()
col.label(text="Layer:")
row = col.row(align=True)
row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL')
row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT')
+ row = layout.row(align=True)
+ row.prop(md, "layer_pass", text="Pass")
+ row.prop(md, "invert_layer_pass", text="", icon='ARROW_LEFTRIGHT')
def GP_SIMPLIFY(self, layout, ob, md):
gpd = ob.data
@@ -1728,14 +1740,20 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
row.enabled = not md.mode == 'FIXED'
row.prop(md, "factor")
- col = split.column()
- col.label(text="Layer:")
+ col = layout.column()
+ col.separator()
+ col.label(text="Material:")
row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL')
+ row.prop(md, "pass_index", text="Pass")
+ row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT')
+ col.label(text="Layer:")
row = col.row(align=True)
- row.prop(md, "pass_index", text="Pass")
- row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT')
+ row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL')
+ row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT')
+ row = layout.row(align=True)
+ row.prop(md, "layer_pass", text="Pass")
+ row.prop(md, "invert_layer_pass", text="", icon='ARROW_LEFTRIGHT')
def GP_THICK(self, layout, ob, md):
gpd = ob.data
@@ -1744,23 +1762,9 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
row = col.row(align=True)
row.prop(md, "thickness")
- row = col.row(align=True)
- row.prop(md, "pass_index", text="Pass")
- row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT')
col.prop(md, "normalize_thickness")
- col = split.column()
- col.label(text="Layer:")
- row = col.row(align=True)
- row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL')
- row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT')
-
- col.label(text="Vertex Group:")
- row = col.row(align=True)
- row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
- row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT')
-
if not md.normalize_thickness:
split = layout.split()
col = split.column()
@@ -1769,6 +1773,26 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
if md.use_custom_curve:
col.template_curve_mapping(md, "curve")
+ col = layout.column()
+ col.separator()
+ col.label(text="Vertex Group:")
+ row = col.row(align=True)
+ row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
+ row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT')
+
+ col.label(text="Material:")
+ row = col.row(align=True)
+ row.prop(md, "pass_index", text="Pass")
+ row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT')
+
+ col.label(text="Layer:")
+ row = col.row(align=True)
+ row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL')
+ row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT')
+ row = layout.row(align=True)
+ row.prop(md, "layer_pass", text="Pass")
+ row.prop(md, "invert_layer_pass", text="", icon='ARROW_LEFTRIGHT')
+
def GP_TINT(self, layout, ob, md):
gpd = ob.data
split = layout.split()
@@ -1777,18 +1801,24 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
col.prop(md, "color")
col.prop(md, "factor")
- col = split.column()
+ row = layout.row()
+ row.prop(md, "create_materials")
+ row.prop(md, "modify_color")
+
+ col = layout.column()
+ col.separator()
+ col.label(text="Material:")
+ row = col.row(align=True)
+ row.prop(md, "pass_index", text="Pass")
+ row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT')
+
col.label(text="Layer:")
row = col.row(align=True)
row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL')
row.prop(md, "invert_layers", text="", icon='ARROW_LEFTRIGHT')
- row = col.row(align=True)
- row.prop(md, "pass_index", text="Pass")
- row.prop(md, "invert_pass", text="", icon='ARROW_LEFTRIGHT')
-
- row = layout.row()
- row.prop(md, "create_materials")
- row.prop(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list