blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 777 Projects 19 Wiki Activity

GPv3: Opacity modifier #116946

Merged
Lukas Tönne merged 52 commits from LukasTonne/blender:gp3-opacity-modifier into main 2024-01-16 16:56:22 +01:00
Conversation 8 Commits 52 Files Changed 11 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5fdae3d54a - Show all commits

4
source/blender/makesrna/intern/rna_modifier.cc
View File

@ -7581,7 +7581,7 @@ static void rna_def_modifier_grease_pencil_vertex_group(StructRNA *srna,
prop = RNA_def_property(srna, "vertex_group_name", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, nullptr, "influence.vertex_group_name");
RNA_def_property_ui_text(prop, "Name", "Vertex group name for modulating the deform");
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name for modulating the deform");
RNA_def_property_string_funcs(prop, nullptr, nullptr, vertex_group_name_set_fn);
RNA_def_property_update(prop, 0, "rna_Modifier_update");
@ -7645,7 +7645,7 @@ static void rna_def_modifier_grease_pencil_opacity(BlenderRNA *brna)
prop = RNA_def_property(srna, "color_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, color_mode_items);
RNA_def_property_ui_text(prop, "Color Mode", "Attributes to modify");
RNA_def_property_ui_text(prop, "Mode", "Attributes to modify");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "color_factor", PROP_FLOAT, PROP_NONE);

4
source/blender/modifiers/intern/MOD_grease_pencil_util.cc
View File

@ -107,7 +107,7 @@ void draw_layer_filter_settings(const bContext * /*C*/, uiLayout *layout, Pointe
sub = uiLayoutRow(row, true);
uiItemR(sub, ptr, "invert_layer_filter", UI_ITEM_NONE, "", ICON_ARROW_LEFTRIGHT);
row = uiLayoutRowWithHeading(col, true, "Layer Pass Filter");
row = uiLayoutRowWithHeading(col, true, "Layer Pass");
uiLayoutSetPropDecorate(row, false);
sub = uiLayoutRow(row, true);
LukasTonne marked this conversation as resolved Outdated
Lukas Tönne commented 2024-01-12 18:07:12 +01:00
Outdated
Review
Copy Link

Would be nice to have the checkbox in the same line as the pass button. I haven't found a good way to combine these buttons yet, could use help from UI experts.

Would be nice to have the checkbox in the same line as the pass button. I haven't found a good way to combine these buttons yet, could use help from UI experts.
Hans Goudey commented 2024-01-12 18:26:23 +01:00
Outdated
Review
Copy Link

It's ugly but possible, here's an example from the limit location constraint:

        row = col.row(heading="Y", align=True)
        row.use_property_decorate = False
        sub = row.row(align=True)
        sub.prop(con, "use_max_y", text="")
        subsub = sub.row(align=True)
        subsub.active = con.use_max_y
        subsub.prop(con, "max_y", text="")
        row.prop_decorator(con, "max_y")
It's ugly but possible, here's an example from the limit location constraint: ``` row = col.row(heading="Y", align=True) row.use_property_decorate = False sub = row.row(align=True) sub.prop(con, "use_max_y", text="") subsub = sub.row(align=True) subsub.active = con.use_max_y subsub.prop(con, "max_y", text="") row.prop_decorator(con, "max_y") ```
Matias Mendiola commented 2024-01-12 19:56:57 +01:00
Outdated
Review
Copy Link

I Agree to have the checkbox on the same line. Hans proposal seems a right choice

I Agree to have the checkbox on the same line. Hans proposal seems a right choice
Lukas Tönne commented 2024-01-15 09:49:12 +01:00
Outdated
Review
Copy Link

I didn't know about the uiLayoutRowWithHeading feature, thanks.

I didn't know about the `uiLayoutRowWithHeading` feature, thanks.
uiItemR(sub, ptr, "use_layer_pass_filter", UI_ITEM_NONE, "", ICON_NONE);
@ -134,7 +134,7 @@ void draw_material_filter_settings(const bContext * /*C*/, uiLayout *layout, Poi
sub = uiLayoutRow(row, true);
uiItemR(sub, ptr, "invert_material_filter", UI_ITEM_NONE, "", ICON_ARROW_LEFTRIGHT);
row = uiLayoutRowWithHeading(col, true, "Material Pass Filter");
row = uiLayoutRowWithHeading(col, true, "Material Pass");
uiLayoutSetPropDecorate(row, false);
sub = uiLayoutRow(row, true);
uiItemR(sub, ptr, "use_material_pass_filter", UI_ITEM_NONE, "", ICON_NONE);