Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPencil: Cleanup typo error for hardness

Browse Source 
The variable cannot be names because it was already renamed.
This commit is contained in:
Antonio Vazquez
2020-04-02 16:27:14 +02:00
parent 7c88968c89
commit e6c732e0cb
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@@ -2045,8 +2045,8 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
col = split.column() col = split.column()
col.prop(md, "modify_color") col.prop(md, "modify_color")
if md.modify_color == 'HARDENESS': if md.modify_color == 'HARDNESS':
col.prop(md, "hardeness") col.prop(md, "hardness")
show = False show = False
else: else:
col.prop(md, "normalize_opacity") col.prop(md, "normalize_opacity")

2
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@@ -1492,7 +1492,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_advanced(View3DPanel, Panel):
ma = brush.gpencil_settings.material ma = brush.gpencil_settings.material
col.separator() col.separator()
col.prop(gp_settings, "hardeness", slider=True) col.prop(gp_settings, "hardness", slider=True)
subcol = col.column(align=True) subcol = col.column(align=True)
if ma and ma.grease_pencil.mode == 'LINE': if ma and ma.grease_pencil.mode == 'LINE':
subcol.enabled = False subcol.enabled = False

2
source/blender/makesrna/intern/rna_brush.c
View File

@@ -1341,7 +1341,7 @@ static void rna_def_gpencil_options(BlenderRNA *brna)
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL); RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL);
/* gradient control */ /* gradient control */
prop = RNA_def_property(srna, "hardeness", PROP_FLOAT, PROP_FACTOR); prop = RNA_def_property(srna, "hardness", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "hardeness"); RNA_def_property_float_sdna(prop, NULL, "hardeness");
RNA_def_property_range(prop, 0.001f, 1.0f); RNA_def_property_range(prop, 0.001f, 1.0f);
RNA_def_property_float_default(prop, 1.0f); RNA_def_property_float_default(prop, 1.0f);

2
source/blender/makesrna/intern/rna_gpencil.c
View File

@@ -1199,7 +1199,7 @@ static void rna_def_gpencil_stroke(BlenderRNA *brna)
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
/* gradient control along y */ /* gradient control along y */
prop = RNA_def_property(srna, "hardeness", PROP_FLOAT, PROP_FACTOR); prop = RNA_def_property(srna, "hardness", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "hardeness"); RNA_def_property_float_sdna(prop, NULL, "hardeness");
RNA_def_property_range(prop, 0.001f, 1.0f); RNA_def_property_range(prop, 0.001f, 1.0f);
RNA_def_property_float_default(prop, 1.0f); RNA_def_property_float_default(prop, 1.0f);

2
source/blender/makesrna/intern/rna_gpencil_modifier.c
View File

@@ -1360,7 +1360,7 @@ static void rna_def_modifier_gpencilopacity(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Opacity Factor", "Factor of Opacity"); RNA_def_property_ui_text(prop, "Opacity Factor", "Factor of Opacity");
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
prop = RNA_def_property(srna, "hardeness", PROP_FLOAT, PROP_NONE); prop = RNA_def_property(srna, "hardness", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "hardeness"); RNA_def_property_float_sdna(prop, NULL, "hardeness");
RNA_def_property_range(prop, 0.0, FLT_MAX); RNA_def_property_range(prop, 0.0, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0, FLT_MAX, 0.1, 2); RNA_def_property_ui_range(prop, 0.0, FLT_MAX, 0.1, 2);