Commit: 9268de3a0e077d479b51e28a551262830ae7492d
Author: Campbell Barton
Date: Sat Nov 10 20:27:20 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB9268de3a0e077d479b51e28a551262830ae7492d
Cleanup: naming
===================================================================
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 363cc5f1797..2c56e6d2178 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -112,7 +112,7 @@ class AnnotationDrawingToolsPanel:
sub.operator("gpencil.active_frames_delete_all", icon='X',
text="Delete Frame(s)")
#sub = col.column(align=True)
- #sub.prop(context.tool_settings, "use_gpencil_additive_drawing",
text="Additive Drawing")
+ #sub.prop(context.tool_settings, "use_gpencil_draw_additive",
text="Additive Drawing")
#sub.prop(context.tool_settings, "use_gpencil_continuous_drawing",
text="Continuous Drawing")
#sub.prop(context.tool_settings, "use_gpencil_draw_onback", text="Draw
on Back")
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index b46747c3a39..ae360788a36 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -71,7 +71,7 @@ class VIEW3D_HT_header(Header):
sub.separator(factor=0.4)
sub.prop(tool_settings, "use_gpencil_weight_data_add",
text="", icon='WPAINT_HLT')
sub.separator(factor=0.4)
- sub.prop(tool_settings, "use_gpencil_additive_drawing",
text="", icon='FREEZE')
+ sub.prop(tool_settings, "use_gpencil_draw_additive", text="",
icon='FREEZE')
if gpd.use_stroke_edit_mode:
row = layout.row(align=True)
diff --git a/source/blender/makesrna/intern/rna_scene.c
b/source/blender/makesrna/intern/rna_scene.c
index 3a9ff73322a..efb1e1d5669 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2484,7 +2484,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)
RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS,
"rna_ToolSettings_gizmo_flag_update");
/* Grease Pencil */
- prop = RNA_def_property(srna, "use_gpencil_additive_drawing",
PROP_BOOLEAN, PROP_NONE);
+ prop = RNA_def_property(srna, "use_gpencil_draw_additive",
PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gpencil_flags",
GP_TOOL_FLAG_RETAIN_LAST);
RNA_def_property_ui_text(prop, "Use Additive Drawing",
"When creating new frames, the strokes from
the previous/active frame "
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
