[Bf-blender-cvs] [516019bc721] greasepencil-object: GP: Rename isect property

[Antonioya]

Commit: 516019bc721dcfbeb5170acf96b78700d0fb6a01
Author: Antonioya
Date:   Sat Jan 5 09:06:30 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB516019bc721dcfbeb5170acf96b78700d0fb6a01

GP: Rename isect property

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

M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M	release/scripts/startup/bl_ui/space_topbar.py
M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/makesrna/intern/rna_sculpt_paint.c

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 84413f6c40a..05fb3719e41 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1134,7 +1134,7 @@ class _defs_gpencil_edit:
     @ToolDef.from_fn
     def select():
         def draw_settings(context, layout, tool):
-            layout.prop(context.tool_settings.gpencil_sculpt, "isect_threshold")
+            layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
         return dict(
             text="Select",
             icon="ops.generic.select",
@@ -1148,7 +1148,7 @@ class _defs_gpencil_edit:
         def draw_settings(context, layout, tool):
             props = tool.operator_properties("gpencil.select_box")
             layout.prop(props, "mode", expand=True)
-            layout.prop(context.tool_settings.gpencil_sculpt, "isect_threshold")
+            layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
         return dict(
             text="Select Box",
             icon="ops.generic.select_box",
@@ -1162,7 +1162,7 @@ class _defs_gpencil_edit:
         def draw_settings(context, layout, tool):
             props = tool.operator_properties("gpencil.select_lasso")
             layout.prop(props, "mode", expand=True)
-            layout.prop(context.tool_settings.gpencil_sculpt, "isect_threshold")
+            layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
         return dict(
             text="Select Lasso",
             icon="ops.generic.select_lasso",
@@ -1174,7 +1174,7 @@ class _defs_gpencil_edit:
     @ToolDef.from_fn
     def circle_select():
         def draw_settings(context, layout, tool):
-            layout.prop(context.tool_settings.gpencil_sculpt, "isect_threshold")
+            layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
         return dict(
             text="Select Circle",
             icon="ops.generic.select_circle",
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 0757481f882..b9de344d687 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -303,7 +303,7 @@ class _draw_left_context_mode:
                 is_paint = False
             elif tool.name == "Cutter":
                 row = layout.row(align=True)
-                row.prop(context.tool_settings.gpencil_sculpt, "isect_threshold")
+                row.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
                 return
             elif not tool.has_datablock:
                 return
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 65e013ca7f9..7a54a485e9b 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -262,7 +262,7 @@ void GPENCIL_OT_selectmode_toggle(wmOperatorType *ot)
 	ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER;
 
 	/* properties */
-	prop = RNA_def_int(ot->srna, "mode", 0, 0, 1, "Select mode", "Select mode", 0, 1);
+	prop = RNA_def_int(ot->srna, "mode", 0, 0, 2, "Select mode", "Select mode", 0, 2);
 	RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
 }
 
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 3e2491df278..d9ff325f7b4 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -1285,7 +1285,7 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
 	/* threshold for cutter */
-	prop = RNA_def_property(srna, "isect_threshold", PROP_FLOAT, PROP_NONE);
+	prop = RNA_def_property(srna, "intersection_threshold", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "isect_threshold");
 	RNA_def_property_range(prop, 0.0f, 10.0f);
 	RNA_def_property_float_default(prop, 0.1f);