[Bf-blender-cvs] [f2f2f5f6c70] temp-lanpr-review: Cleanup: Code style and dead code stuff.

[YimingWu]

Commit: f2f2f5f6c702e333353add6db86c41ea2608c044
Author: YimingWu
Date:   Wed Nov 20 16:11:10 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rBf2f2f5f6c702e333353add6db86c41ea2608c044

Cleanup: Code style and dead code stuff.

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

M	source/blender/editors/space_buttons/buttons_context.c
M	source/blender/makesrna/intern/rna_lanpr.c
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index c071c6af43c..d46ff6bfba1 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -166,8 +166,6 @@ static int buttons_context_path_world(ButsContextPath *path)
 
 static int buttons_context_path_collection(ButsContextPath *path, wmWindow *window)
 {
-  Scene *scene;
-  World *world;
   PointerRNA *ptr = &path->ptr[path->len - 1];
 
   /* if we already have a (pinned) collection, we're done */
diff --git a/source/blender/makesrna/intern/rna_lanpr.c b/source/blender/makesrna/intern/rna_lanpr.c
index 1a4ef2aefd8..938a372826a 100644
--- a/source/blender/makesrna/intern/rna_lanpr.c
+++ b/source/blender/makesrna/intern/rna_lanpr.c
@@ -110,7 +110,7 @@ static void rna_def_lanpr_line_layer(BlenderRNA *brna)
   prop = RNA_def_property(srna, "use_same_style", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flags", LANPR_LINE_LAYER_USE_SAME_STYLE);
   RNA_def_property_boolean_default(prop, true);
-  RNA_def_property_ui_text(prop, "Same Style", "Use same styles for multiple line types.");
+  RNA_def_property_ui_text(prop, "Same Style", "Use same styles for multiple line types");
 
   prop = RNA_def_property(srna, "use_multiple_levels", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flags", LANPR_LINE_LAYER_USE_MULTIPLE_LEVELS);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 1b7b83384fb..d1f79017a29 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -7072,14 +7072,6 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
       {LANPR_MASTER_MODE_DPIX, "DPIX", 0, "GPU", "DPIX GPU edge extraction"},
       {0, NULL, 0, NULL, NULL}};
 
-  static const EnumPropertyItem rna_enum_lanpr_use_same_taper[] = {
-      {LANPR_USE_DIFFERENT_TAPER, "DISABLED", 0, "Different", "Use different taper value"},
-      {LANPR_USE_SAME_TAPER,
-       "ENABLED",
-       0,
-       "Same",
-       "Use same taper value for both sides of the line"},
-      {0, NULL, 0, NULL, NULL}};
   static const EnumPropertyItem rna_enum_lanpr_gpu_cache_size[] = {
       {LANPR_GPU_CACHE_SIZE_512, "S512", 0, "512", "512px texture as cache"},
       {LANPR_GPU_CACHE_SIZE_1K, "S1K", 0, "1K", "1K px texture as cache"},
@@ -7128,7 +7120,7 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
 
   prop = RNA_def_property(srna, "depth_width_influence", PROP_FLOAT, PROP_PERCENTAGE);
   RNA_def_property_float_default(prop, 0.3f);
-  RNA_def_property_ui_text(prop, "Width Influence", "Use camera distance to control line width.");
+  RNA_def_property_ui_text(prop, "Width Influence", "Use camera distance to control line width");
   RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.05, 2);
   RNA_def_property_flag(prop, PROP_EDITABLE);
   RNA_def_property_update(prop, NC_SCENE, NULL);
@@ -7142,7 +7134,7 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
 
   prop = RNA_def_property(srna, "depth_alpha_influence", PROP_FLOAT, PROP_PERCENTAGE);
   RNA_def_property_float_default(prop, 0.3f);
-  RNA_def_property_ui_text(prop, "Alpha Influence", "Use camera distance to control line alpha.");
+  RNA_def_property_ui_text(prop, "Alpha Influence", "Use camera distance to control line alpha");
   RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.05f, 2);
   RNA_def_property_flag(prop, PROP_EDITABLE);
   RNA_def_property_update(prop, NC_SCENE, NULL);
@@ -7225,7 +7217,7 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
   RNA_def_property_boolean_default(prop, 0);
   RNA_def_property_boolean_funcs(prop, "rna_lanpr_shader_error_get", "");
   RNA_def_property_ui_text(
-      prop, "DPIX Shader Error", "Can't compile DPIX transform shader on your GPU.");
+      prop, "DPIX Shader Error", "Can't compile DPIX transform shader on your GPU");
 
   prop = RNA_def_property(srna, "chaining_geometry_threshold", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_default(prop, 0.1f);