[Bf-blender-cvs] [cfd060147bb] temp-lanpr-staging: Cleanup: Use "normal_thickness_start".

YimingWu noreply at git.blender.org
Fri Aug 16 03:27:38 CEST 2019


Commit: cfd060147bb1f74daf9ea54b797d533723991406
Author: YimingWu
Date:   Sun Aug 11 17:25:05 2019 +0800
Branches: temp-lanpr-staging
https://developer.blender.org/rBcfd060147bb1f74daf9ea54b797d533723991406

Cleanup: Use "normal_thickness_start".

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

M	release/scripts/startup/bl_ui/properties_render.py
M	source/blender/draw/engines/lanpr/lanpr_cpu.c
M	source/blender/draw/engines/lanpr/lanpr_engine.c
M	source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl
M	source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl
M	source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
M	source/blender/editors/lanpr/lanpr_cpu.c
M	source/blender/makesdna/DNA_lanpr_types.h
M	source/blender/makesrna/intern/rna_lanpr.c

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

diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 3945460d0f6..ec22f407d67 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -745,7 +745,7 @@ class RENDER_PT_lanpr(RenderButtonsPanel, Panel):
             txt = "Update" if mode == "SOFTWARE" else "Intersection Cache"
             if not lanpr.auto_update:
                 c.operator("scene.lanpr_calculate", icon='FILE_REFRESH', text=txt)
-                
+
         if mode == "DPIX" and len(lanpr.layers)==0:
             layout.label(text="You don't have a layer to display.")
             layout.operator("scene.lanpr_add_line_layer");
@@ -906,7 +906,7 @@ class RENDER_PT_lanpr_line_normal_effects(RenderButtonsPanel, Panel):
             col.prop(active_layer,"normal_ramp_begin")
             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_start", slider=True)
             col.prop(active_layer,"normal_thickness_end", slider=True, text="End")
 
 class RENDER_PT_lanpr_line_gpu_effects(RenderButtonsPanel, Panel):
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 1944e30cb9f..f4081fc979a 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -327,7 +327,7 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
         DRW_shgroup_uniform_float(rb->ChainShgrp, "normal_ramp_begin", &ll->normal_ramp_begin, 1);
         DRW_shgroup_uniform_float(rb->ChainShgrp, "normal_ramp_end", &ll->normal_ramp_end, 1);
         DRW_shgroup_uniform_float(
-            rb->ChainShgrp, "normal_thickness_begin", &ll->normal_thickness_begin, 1);
+            rb->ChainShgrp, "normal_thickness_start", &ll->normal_thickness_start, 1);
         DRW_shgroup_uniform_float(
             rb->ChainShgrp, "normal_thickness_end", &ll->normal_thickness_end, 1);
         DRW_shgroup_uniform_vec3(rb->ChainShgrp, "normal_direction", normal_object_direction, 1);
@@ -428,7 +428,7 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
           DRW_shgroup_uniform_float(ll->shgrp, "normal_ramp_begin", &ll->normal_ramp_begin, 1);
           DRW_shgroup_uniform_float(ll->shgrp, "normal_ramp_end", &ll->normal_ramp_end, 1);
           DRW_shgroup_uniform_float(
-              ll->shgrp, "normal_thickness_begin", &ll->normal_thickness_begin, 1);
+              ll->shgrp, "normal_thickness_start", &ll->normal_thickness_start, 1);
           DRW_shgroup_uniform_float(
               ll->shgrp, "normal_thickness_end", &ll->normal_thickness_end, 1);
           DRW_shgroup_uniform_vec3(ll->shgrp, "normal_direction", normal_object_direction, 1);
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 4ffac758ea0..12e3901877d 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -395,7 +395,7 @@ static void lanpr_cache_init(void *vedata)
     DRW_shgroup_uniform_float(
         stl->g_data->dpix_preview_shgrp, "normal_ramp_end", &ll->normal_ramp_end, 1);
     DRW_shgroup_uniform_float(
-        stl->g_data->dpix_preview_shgrp, "normal_thickness_begin", &ll->normal_thickness_begin, 1);
+        stl->g_data->dpix_preview_shgrp, "normal_thickness_start", &ll->normal_thickness_start, 1);
     DRW_shgroup_uniform_float(
         stl->g_data->dpix_preview_shgrp, "normal_thickness_end", &ll->normal_thickness_end, 1);
     DRW_shgroup_uniform_vec3(
diff --git a/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl b/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl
index 2abdf2a6125..4d83d47e4fc 100644
--- a/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl
+++ b/source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl
@@ -40,7 +40,7 @@ uniform int normal_effect_inverse;
 uniform vec3 normal_direction;  // also used as point position
 uniform float normal_ramp_begin;
 uniform float normal_ramp_end;
-uniform float normal_thickness_begin;
+uniform float normal_thickness_start;
 uniform float normal_thickness_end;
 
 float use_thickness;
@@ -132,8 +132,8 @@ float factor_to_thickness(float factor)
   if (r < 0)
     r = 0;
   float thickness = normal_effect_inverse == 1 ?
-                        mix(normal_thickness_begin, normal_thickness_end, r) :
-                        mix(normal_thickness_end, normal_thickness_begin, r);
+                        mix(normal_thickness_start, normal_thickness_end, r) :
+                        mix(normal_thickness_end, normal_thickness_start, r);
   return thickness;
 }
 
diff --git a/source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl b/source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl
index 3e867959bf3..51a7238548a 100644
--- a/source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl
+++ b/source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl
@@ -11,7 +11,7 @@ uniform int normal_effect_inverse;
 uniform vec3 normal_direction;  // also used as point position
 uniform float normal_ramp_begin;
 uniform float normal_ramp_end;
-uniform float normal_thickness_begin;
+uniform float normal_thickness_start;
 uniform float normal_thickness_end;
 
 uniform float thickness;
@@ -178,8 +178,8 @@ float factor_to_thickness(float factor)
   if (r < 0)
     r = 0;
   float thickness = normal_effect_inverse == 1 ?
-                        mix(normal_thickness_begin, normal_thickness_end, r) :
-                        mix(normal_thickness_end, normal_thickness_begin, r);
+                        mix(normal_thickness_start, normal_thickness_end, r) :
+                        mix(normal_thickness_end, normal_thickness_start, r);
   return thickness;
 }
 
diff --git a/source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl b/source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
index 54c38a07db6..88268b2aea7 100644
--- a/source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
+++ b/source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
@@ -7,7 +7,7 @@ uniform int normal_effect_inverse;
 uniform vec3 normal_direction;  // also used as point position
 uniform float normal_ramp_begin;
 uniform float normal_ramp_end;
-uniform float normal_thickness_begin;
+uniform float normal_thickness_start;
 uniform float normal_thickness_end;
 
 uniform float thickness;
@@ -85,8 +85,8 @@ float factor_to_thickness(float factor)
   if (r < 0)
     r = 0;
   float thickness = normal_effect_inverse == 1 ?
-                        mix(normal_thickness_begin, normal_thickness_end, r) :
-                        mix(normal_thickness_end, normal_thickness_begin, r);
+                        mix(normal_thickness_start, normal_thickness_end, r) :
+                        mix(normal_thickness_end, normal_thickness_start, r);
   return thickness;
 }
 
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c
index 7d15ad7ad41..4c1c254aea0 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lanpr/lanpr_cpu.c
@@ -144,7 +144,7 @@ LANPR_LineLayer *ED_lanpr_new_line_layer(SceneLANPR *lanpr)
   ll->edge_mark.enabled = 1;
   ll->intersection.enabled = 1;
 
-  ll->normal_thickness_begin = 0.2f;
+  ll->normal_thickness_start = 0.2f;
   ll->normal_thickness_end = 1.5f;
   ll->normal_ramp_begin = 0.0f;
   ll->normal_ramp_end = 1.0f;
diff --git a/source/blender/makesdna/DNA_lanpr_types.h b/source/blender/makesdna/DNA_lanpr_types.h
index 953a8edc3c5..6b2196b5544 100644
--- a/source/blender/makesdna/DNA_lanpr_types.h
+++ b/source/blender/makesdna/DNA_lanpr_types.h
@@ -119,7 +119,7 @@ typedef struct LANPR_LineLayer {
   int normal_effect_inverse;
   float normal_ramp_begin;
   float normal_ramp_end;
-  float normal_thickness_begin;
+  float normal_thickness_start;
   float normal_thickness_end;
   struct Object *normal_control_object;
 
diff --git a/source/blender/makesrna/intern/rna_lanpr.c b/source/blender/makesrna/intern/rna_lanpr.c
index dedf58601d1..112370b0513 100644
--- a/source/blender/makesrna/intern/rna_lanpr.c
+++ b/source/blender/makesrna/intern/rna_lanpr.c
@@ -90,7 +90,7 @@ static void rna_def_lanpr_line_layer(BlenderRNA *brna)
   RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.05, 2);
 
   prop = RNA_def_property(
-      srna, "normal_thickness_begin", PROP_FLOAT, PROP_NONE); /* begin is least strength */
+      srna, "normal_thickness_start", PROP_FLOAT, PROP_NONE); /* begin is least strength */
   RNA_def_property_float_default(prop, 0.2f);
   RNA_def_property_ui_text(prop, "Thickness Begin", "Normal thickness begin value");
   RNA_def_property_ui_range(prop, 0.0f, 5.0f, 0.05, 2);



More information about the Bf-blender-cvs mailing list