diff options
| author | Antonioya <blendergit@gmail.com> | 2018-08-07 21:10:20 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2018-08-07 21:10:20 +0300 |
| commit | 8a035612ee8bd361bf43c8935b03822cf1208435 (patch) | |
| tree | f5d0d4b1227a888e9c4738b49d31f679f4aa10a8 /source/blender/makesrna/intern/rna_gpencil_modifier.c | |
| parent | 035d827b5b132627d5ea73e3fa237d8fd2185b4f (diff) | |
Fix T56266: Grease Pencil Tint and Color modifier error when apply
The material created was not right when apply the modifiers.
These errors were related to the material modification from old palette system before the merge and for any reason this code was not changed in the right way.
Also changed the "Create Colors" to "Create Materials" to keep UI names aligned.
Diffstat (limited to 'source/blender/makesrna/intern/rna_gpencil_modifier.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_gpencil_modifier.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index 8c4edf8030c..1bfcf415a94 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -681,9 +681,9 @@ static void rna_def_modifier_gpenciltint(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Factor", "Factor for mixing color"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); - prop = RNA_def_property(srna, "create_colors", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "create_materials", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_TINT_CREATE_COLORS); - RNA_def_property_ui_text(prop, "Create Colors", "When apply modifier, create new color in the palette"); + RNA_def_property_ui_text(prop, "Create Materials", "When apply modifier, create new material"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "pass_index", PROP_INT, PROP_NONE); @@ -739,9 +739,9 @@ static void rna_def_modifier_gpencilcolor(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Value", "Color Value"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); - prop = RNA_def_property(srna, "create_colors", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "create_materials", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_COLOR_CREATE_COLORS); - RNA_def_property_ui_text(prop, "Create Colors", "When apply modifier, create new color in the palette"); + RNA_def_property_ui_text(prop, "Create Materials", "When apply modifier, create new material"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "pass_index", PROP_INT, PROP_NONE); |