[Bf-blender-cvs] [bcf9a62ca28] temp-gpencil-fading-modifier: GPencil: property name change to "use_fading".

[YimingWu]

Commit: bcf9a62ca2862e38027cf6a5844aa5514ee74b98
Author: YimingWu
Date:   Fri Oct 2 21:57:59 2020 +0800
Branches: temp-gpencil-fading-modifier
https://developer.blender.org/rBbcf9a62ca2862e38027cf6a5844aa5514ee74b98

GPencil: property name change to "use_fading".

===================================================================

M	source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
M	source/blender/makesrna/intern/rna_gpencil_modifier.c

===================================================================

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index eee06f20190..da9e6c7ad0c 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
@@ -278,8 +278,8 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
     uiItemR(layout, ptr, "factor", 0, text, ICON_NONE);
   }
 
-  bool fading_enabled = RNA_boolean_get(ptr, "fading");
-  uiItemR(layout, ptr, "fading", 0, NULL, ICON_NONE);
+  bool fading_enabled = RNA_boolean_get(ptr, "use_fading");
+  uiItemR(layout, ptr, "use_fading", 0, NULL, ICON_NONE);
   if (fading_enabled) {
     uiItemR(layout, ptr, "object", 0, NULL, ICON_CUBE);
     uiLayout *sub = uiLayoutColumn(layout, true);
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
index 3bc53d48c9c..59df43c408f 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
@@ -219,8 +219,8 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
     uiItemR(layout, ptr, "thickness_factor", 0, NULL, ICON_NONE);
   }
 
-  bool fading_enabled = RNA_boolean_get(ptr, "fading");
-  uiItemR(layout, ptr, "fading", 0, NULL, ICON_NONE);
+  bool fading_enabled = RNA_boolean_get(ptr, "use_fading");
+  uiItemR(layout, ptr, "use_fading", 0, NULL, ICON_NONE);
   if (fading_enabled) {
     uiItemR(layout, ptr, "object", 0, NULL, ICON_CUBE);
     uiLayout *sub = uiLayoutColumn(layout, true);
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index f6349ac27d5..b11d9a9a2f2 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -892,9 +892,9 @@ static void rna_def_modifier_gpencilthick(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Thickness Factor", "Factor to multiply the thickness with");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
-  prop = RNA_def_property(srna, "fading", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_fading", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_THICK_FADING);
-  RNA_def_property_ui_text(prop, "Fading", "Fading effect");
+  RNA_def_property_ui_text(prop, "use_fading", "Fading effect");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
   /* Distance reference object */
@@ -1412,9 +1412,9 @@ static void rna_def_modifier_gpencilopacity(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Hardness", "Factor of stroke hardness");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
-  prop = RNA_def_property(srna, "fading", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_fading", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_OPACITY_FADING);
-  RNA_def_property_ui_text(prop, "Fading", "Fading effect");
+  RNA_def_property_ui_text(prop, "use_fading", "Fading effect");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
   /* Distance reference object */