diff options
author | Matias Mendiola <matias.mendiola@gmail.com> | 2019-08-21 09:30:45 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2019-08-21 09:41:19 +0300 |
commit | 3d8f1586973b1fbadf3cf45c66873d1a012764ee (patch) | |
tree | e856b4a1708c441878039f385fad982b37b4e8f1 /release | |
parent | 8ffbe398341ca81acbb1515864fa55027fa68766 (diff) |
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
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 106 |
1 files changed, 106 insertions, 0 deletions
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 = col.row(align=True) row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL') @@ -2188,11 +2285,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') |