[Bf-blender-cvs] [52db223bd6e] soc-2019-npr: LANPR: UI refactor: naming fixes in the main panel.

[YimingWu]

Commit: 52db223bd6e302ce17128144376243f4c7b823fc
Author: YimingWu
Date:   Fri Jul 26 11:09:11 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB52db223bd6e302ce17128144376243f4c7b823fc

LANPR: UI refactor: naming fixes in the main panel.

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

M	release/scripts/startup/bl_ui/properties_render.py
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 71107184e2f..15033d8691f 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -845,7 +845,7 @@ class RENDER_PT_lanpr_layer_settings(RenderButtonsPanel, Panel):
             active_layer = lanpr.layers[0]
 
         if mode == "SOFTWARE":
-            layout.prop(active_layer, "use_multiple_levels")
+            layout.prop(active_layer, "use_multiple_levels", text="Multiple Levels")
             col = layout.column(align=True)
             col.prop(active_layer, "qi_begin", text='Level Start')
             if active_layer.use_multiple_levels:
@@ -943,10 +943,10 @@ class RENDER_PT_lanpr_line_normal_effects(RenderButtonsPanel, Panel):
             layout.prop(active_layer,"normal_effect_inverse")
             col = layout.column(align=True)
             col.prop(active_layer,"normal_ramp_begin")
-            col.prop(active_layer,"normal_ramp_end")
+            col.prop(active_layer,"normal_ramp_end", text="End")
             col = layout.column(align=True)
             col.prop(active_layer,"normal_thickness_begin", slider=True)
-            col.prop(active_layer,"normal_thickness_end", slider=True)
+            col.prop(active_layer,"normal_thickness_end", slider=True, text="End")
 
 class RENDER_PT_lanpr_line_gpu_effects(RenderButtonsPanel, Panel):
     bl_label = "Effects"
@@ -972,13 +972,13 @@ class RENDER_PT_lanpr_line_gpu_effects(RenderButtonsPanel, Panel):
 
         col = layout.column(align = True)
         col.prop(lanpr, "crease_threshold")
-        col.prop(lanpr, "crease_fade_threshold")
+        col.prop(lanpr, "crease_fade_threshold", text="Fade")
         col = layout.column(align = True)
         col.prop(lanpr, "depth_width_influence")
-        col.prop(lanpr, "depth_width_curve")
+        col.prop(lanpr, "depth_width_curve", text="Curve")
         col = layout.column(align = True)
         col.prop(lanpr, "depth_alpha_influence")
-        col.prop(lanpr, "depth_alpha_curve")
+        col.prop(lanpr, "depth_alpha_curve", text="Curve")
 
 
 class RENDER_PT_lanpr_snake_sobel_parameters(RenderButtonsPanel, Panel):
@@ -1044,11 +1044,11 @@ class RENDER_PT_lanpr_snake_settings(RenderButtonsPanel, Panel):
             col = split.column(align = True)
             col.label(text="Left:")
             col.prop(lanpr,"taper_left_distance")
-            col.prop(lanpr,"taper_left_strength")
+            col.prop(lanpr,"taper_left_strength", text="Strength")
             col = split.column(align = True)
             col.label(text="Right:")
             col.prop(lanpr,"taper_right_distance")
-            col.prop(lanpr,"taper_right_strength")
+            col.prop(lanpr,"taper_right_strength", text="Strength")
         else:
             split = layout.split()
             col = split.column(align = True)
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index a3b6dde138a..10ced022bcd 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -7307,28 +7307,28 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
 
   prop = RNA_def_property(srna, "taper_left_distance", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_default(prop, 20.0f);
-  RNA_def_property_ui_text(prop, "Distance Left", "Left side taper distance");
+  RNA_def_property_ui_text(prop, "Left Distance", "Left side taper distance");
   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, "taper_right_distance", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_default(prop, 20.0f);
-  RNA_def_property_ui_text(prop, "Distance right", "Right side taper distance");
+  RNA_def_property_ui_text(prop, "Right Distance", "Right side taper distance");
   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, "taper_left_strength", PROP_FLOAT, PROP_FACTOR);
   RNA_def_property_float_default(prop, 1.0f);
-  RNA_def_property_ui_text(prop, "Strength left", "Left side taper strength");
+  RNA_def_property_ui_text(prop, "Left Strength", "Left side taper strength");
   RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 2);
   RNA_def_property_flag(prop, PROP_EDITABLE);
   RNA_def_property_update(prop, NC_SCENE, NULL);
 
   prop = RNA_def_property(srna, "taper_right_strength", PROP_FLOAT, PROP_FACTOR);
   RNA_def_property_float_default(prop, 1.0f);
-  RNA_def_property_ui_text(prop, "Strength right", "Right side taper strength");
+  RNA_def_property_ui_text(prop, "Right Strength", "Right side taper strength");
   RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 2);
   RNA_def_property_flag(prop, PROP_EDITABLE);
   RNA_def_property_update(prop, NC_SCENE, NULL);