[Bf-blender-cvs] [4f8bc3e35ca] master: GPencil: Move Autofit parameter from topbar to advanced panel
Antonio Vazquez
noreply at git.blender.org
Thu Feb 11 15:59:58 CET 2021
Commit: 4f8bc3e35ca2bdf3907f6506b113ebecdcd37957
Author: Antonio Vazquez
Date: Thu Feb 11 15:55:33 2021 +0100
Branches: master
https://developer.blender.org/rB4f8bc3e35ca2bdf3907f6506b113ebecdcd37957
GPencil: Move Autofit parameter from topbar to advanced panel
As this is used only in corner cases, it is better keep in advanced panel.
Also renamed to "Limit to Viewport"
===================================================================
M release/scripts/startup/bl_ui/properties_paint_common.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/makesrna/intern/rna_brush.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 30e50bde969..54c6de30ef8 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -1223,8 +1223,6 @@ def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False)
row.prop(gp_settings, "fill_leak", text="Leak Size")
row = layout.row(align=True)
row.prop(brush, "size", text="Thickness")
- row = layout.row(align=True)
- row.prop(gp_settings, "use_fill_autofit", text="", icon="SNAP_FACE_CENTER")
else: # brush.gpencil_tool == 'DRAW/TINT':
row = layout.row(align=True)
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 20ec26200f6..f93a6f3346b 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1463,6 +1463,10 @@ class VIEW3D_PT_tools_grease_pencil_brush_advanced(View3DPanel, Panel):
sub.active = gp_settings.show_fill
sub.prop(gp_settings, "fill_threshold", text="")
+ col.separator()
+ row = col.row(align=True)
+ row.prop(gp_settings, "use_fill_limit")
+
class VIEW3D_PT_tools_grease_pencil_brush_stroke(Panel, View3DPanel):
bl_context = ".greasepencil_paint"
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 6e2e986ebf8..3dcc9471906 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -1849,13 +1849,10 @@ static void rna_def_gpencil_options(BlenderRNA *brna)
prop, "Show Fill", "Show transparent lines to use as boundary for filling");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
- prop = RNA_def_property(srna, "use_fill_autofit", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GP_BRUSH_FILL_FIT_DISABLE);
+ prop = RNA_def_property(srna, "use_fill_limit", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_BRUSH_FILL_FIT_DISABLE);
RNA_def_property_boolean_default(prop, true);
- RNA_def_property_ui_text(
- prop,
- "Automatic Fit",
- "Fit the shape of the stroke to try to fill areas outside visible viewport");
+ RNA_def_property_ui_text(prop, "Limit to Viewport", "Fill only visible areas in viewport");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
prop = RNA_def_property(srna, "use_default_eraser", PROP_BOOLEAN, PROP_NONE);
More information about the Bf-blender-cvs
mailing list