[Bf-blender-cvs] [583fb8c1405] blender2.8: Cleanup: RNA naming

Campbell Barton noreply at git.blender.org
Wed Aug 22 07:37:57 CEST 2018


Commit: 583fb8c1405cda2d89b36728f83962978bbb7a24
Author: Campbell Barton
Date:   Wed Aug 22 15:41:26 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB583fb8c1405cda2d89b36728f83962978bbb7a24

Cleanup: RNA naming

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

M	release/scripts/startup/bl_ui/properties_data_gpencil.py
M	source/blender/makesrna/intern/rna_gpencil.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 169b521a2eb..be35d2ba86c 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -367,13 +367,13 @@ class DATA_PT_gpencil_display(DataButtonsPanel, Panel):
         layout.prop(gpd, "edit_line_color", text="Edit Line Color")
         layout.prop(ob, "empty_draw_size", text="Marker Size")
 
-        layout.prop(gpd, "force_fill_recalc", text="Force Fill Update")
+        layout.prop(gpd, "use_force_fill_recalc", text="Force Fill Update")
 
         col = layout.column(align=True)
         col.prop(gpd, "show_constant_thickness")
         sub = col.column()
         sub.active = not gpd.show_constant_thickness
-        sub.prop(gpd, "pixfactor", text="Thickness Scale")
+        sub.prop(gpd, "pixel_factor", text="Thickness Scale")
 
         if gpl:
             layout.prop(gpd, "show_stroke_direction", text="Show Stroke Directions")
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 8bb7b7ebcc2..6beb8c5313e 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1306,7 +1306,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Keep Thickness", "Maintain the thickness of the stroke when the viewport zoom changes");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
-	prop = RNA_def_property(srna, "pixfactor", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "pixel_factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "pixfactor");
 	RNA_def_property_range(prop, 0.1f, 30.0f);
 	RNA_def_property_ui_range(prop, 0.1f, 30.0f, 1, 2);
@@ -1318,7 +1318,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "MultiFrame", "Edit strokes from multiple grease pencil keyframes at the same time (keyframes must be selected to be included)");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
-	prop = RNA_def_property(srna, "force_fill_recalc", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_force_fill_recalc", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_STROKE_FORCE_RECALC);
 	RNA_def_property_ui_text(prop, "Force Fill Update", "Force recalc of fill data after use deformation modifiers (reduce FPS)");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");



More information about the Bf-blender-cvs mailing list