[Bf-blender-cvs] [b165d0a4141] soc-2019-npr: LANPR: Removed "Tip Extend" data and properties. GP Modifiers will handle this.

[YimingWu]

Commit: b165d0a41418e2a638459f0f0c28a21a65d0b9f3
Author: YimingWu
Date:   Wed Jun 19 15:20:36 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBb165d0a41418e2a638459f0f0c28a21a65d0b9f3

LANPR: Removed "Tip Extend" data and properties. GP Modifiers will handle this.

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

M	release/scripts/startup/bl_ui/properties_render.py
M	source/blender/makesdna/DNA_lanpr_types.h
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 1ce3101cf83..c22fb320e50 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -1014,7 +1014,7 @@ class RENDER_PT_lanpr_snake_settings(RenderButtonsPanel, Panel):
             layout.prop(lanpr,"extend_length")
 
 class RENDER_PT_lanpr_software_chain_styles(RenderButtonsPanel, Panel):
-    bl_label = "Chain Styles"
+    bl_label = "Chaining Options"
     bl_parent_id = "RENDER_PT_lanpr"
     bl_options = {'DEFAULT_CLOSED'}
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_LANPR', 'BLENDER_OPENGL', 'BLENDER_EEVEE'}
@@ -1047,12 +1047,6 @@ class RENDER_PT_lanpr_software_chain_styles(RenderButtonsPanel, Panel):
             col.prop(lanpr,"taper_left_distance")
             col.prop(lanpr,"taper_left_strength") 
 
-        layout.label(text="Tip Extend:")
-        layout.prop(lanpr, "enable_tip_extend",  expand = True)
-        if lanpr.enable_tip_extend == "ENABLED":
-            layout.label(text="---INOP---")
-            layout.prop(lanpr,"extend_length")
-
 
 classes = (
     RENDER_PT_context,
diff --git a/source/blender/makesdna/DNA_lanpr_types.h b/source/blender/makesdna/DNA_lanpr_types.h
index 3f43f1250cb..b08b55298f3 100644
--- a/source/blender/makesdna/DNA_lanpr_types.h
+++ b/source/blender/makesdna/DNA_lanpr_types.h
@@ -50,9 +50,6 @@ struct Collection;
 #define LANPR_USE_DIFFERENT_TAPER 0
 #define LANPR_USE_SAME_TAPER 1
 
-#define LANPR_DISABLE_TIP_EXTEND 0
-#define LANPR_ENABLE_TIP_EXTEND 1
-
 #define LANPR_NORMAL_DONT_CARE 0
 #define LANPR_NORMAL_DIRECTIONAL 1
 #define LANPR_NORMAL_POINT 2
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index ef0e864b7a2..c05ed05ff77 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1660,9 +1660,6 @@ typedef struct SceneLANPR {
   float taper_right_distance;
   float taper_right_strength;
 
-  int enable_tip_extend;
-  float extend_length;
-
   int snake_sensitivity;
 
   /* shared */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 34c8eed211f..d6620a03cd8 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -7177,15 +7177,6 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
        "Use same taper value for both sides of the line"},
       {0, NULL, 0, NULL, NULL}};
 
-  static const EnumPropertyItem rna_enum_lanpr_enable_tip_extend[] = {
-      {LANPR_DISABLE_TIP_EXTEND, "DISABLED", 0, "Disable", "Do not extend curve tips"},
-      {LANPR_ENABLE_TIP_EXTEND,
-       "ENABLED",
-       0,
-       "Enable",
-       "Extend curve tips to a user specified length"},
-      {0, NULL, 0, NULL, NULL}};
-
   srna = RNA_def_struct(brna, "SceneLANPR", NULL);
   RNA_def_struct_sdna(srna, "SceneLANPR");
   RNA_def_struct_ui_text(srna, "Scene LANPR Config", "LANPR global config");
@@ -7341,20 +7332,6 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
   RNA_def_property_flag(prop, PROP_EDITABLE);
   RNA_def_property_update(prop, NC_SCENE, NULL);
 
-  prop = RNA_def_property(srna, "enable_tip_extend", PROP_ENUM, PROP_NONE);
-  RNA_def_property_enum_items(prop, rna_enum_lanpr_enable_tip_extend);
-  RNA_def_property_enum_default(prop, LANPR_DISABLE_TIP_EXTEND);
-  RNA_def_property_ui_text(prop, "Extend Tips", "Extending tips of curves");
-  RNA_def_property_flag(prop, PROP_EDITABLE);
-  RNA_def_property_update(prop, NC_SCENE, NULL);
-
-  prop = RNA_def_property(srna, "extend_length", PROP_FLOAT, PROP_FACTOR);
-  RNA_def_property_float_default(prop, 1.0f);
-  RNA_def_property_ui_text(prop, "Extend Length", "Extend lenght of curves");
-  RNA_def_property_ui_range(prop, 0.0f, 100.0f, 0.1, 2);
-  RNA_def_property_flag(prop, PROP_EDITABLE);
-  RNA_def_property_update(prop, NC_SCENE, NULL);
-
   prop = RNA_def_property(srna, "crease_threshold", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_default(prop, 0.5f);
   RNA_def_property_ui_text(prop, "Crease Threshold", "cosine value of face angle");