Commit: 3d8f1586973b1fbadf3cf45c66873d1a012764ee Author: Matias Mendiola Date: Wed Aug 21 08:30:45 2019 +0200 Branches: master https://developer.blender.org/rB3d8f1586973b1fbadf3cf45c66873d1a012764ee
GPencil: add new filter by material to modifiers This commit adds a new filter by material using the name and not only the index. Reviewers: antoniov, pepeland Differential Revision: https://developer.blender.org/D5544 =================================================================== 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_gpencilarray.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_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_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 1d1ee2e52be..47c911821fc 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -1706,11 +1706,20 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Material:") row = col.row(align=True) + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -1738,11 +1747,20 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Material:") row = col.row(align=True) + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -1762,11 +1780,19 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col = layout.column() col.separator() + col.label(text="Material:") row = col.row(align=True) + + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -1797,11 +1823,18 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col = layout.column() col.separator() + col.label(text="Material:") row = col.row(align=True) + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -1835,11 +1868,20 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Material:") row = col.row(align=True) + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -1862,11 +1904,18 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col = layout.column() col.separator() + col.label(text="Material:") row = col.row(align=True) + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -1934,11 +1983,18 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col = layout.column() col.separator() + col.label(text="Material:") row = col.row(align=True) + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -1966,11 +2022,20 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Material:") row = col.row(align=True) + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -2018,11 +2083,18 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col = layout.column() col.separator() + col.label(text="Material:") row = col.row(align=True) + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -2083,11 +2155,20 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Material:") row = col.row(align=True) + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -2109,11 +2190,18 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col = layout.column() col.separator() + col.label(text="Material:") row = col.row(align=True) + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -2160,11 +2248,20 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Material:") row = col.row(align=True) + row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE') + row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT') + row = layout.row(align=True) row.prop(md, "pass_index", text="Pass") row.prop(md, "invert_material_pass", text="", icon='ARROW_LEFTRIGHT') + col = layout.column() + col.separator() + col.label(text="Layer:") row @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
