[Bf-blender-cvs] [e80480ad415] temp-lanpr-staging: LANPR: qi_begin/end => level_start/end

YimingWu noreply at git.blender.org
Wed Sep 4 09:16:52 CEST 2019


Commit: e80480ad415fe43e08a82d6e1e91a2dc0bc432d7
Author: YimingWu
Date:   Wed Sep 4 15:16:09 2019 +0800
Branches: temp-lanpr-staging
https://developer.blender.org/rBe80480ad415fe43e08a82d6e1e91a2dc0bc432d7

LANPR: qi_begin/end => level_start/end

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

M	release/scripts/startup/bl_ui/properties_render.py
M	source/blender/draw/engines/lanpr/lanpr_cpu.c
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 73eefc9387c..0877747e8a7 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -808,9 +808,9 @@ class RENDER_PT_lanpr_layer_settings(RenderButtonsPanel, Panel):
         if mode == "SOFTWARE":
             layout.prop(active_layer, "use_multiple_levels", text="Multiple Levels")
             col = layout.column(align=True)
-            col.prop(active_layer, "qi_begin", text='Level Start')
+            col.prop(active_layer, "level_start", text='Level Start')
             if active_layer.use_multiple_levels:
-                col.prop(active_layer, "qi_end", text='End')
+                col.prop(active_layer, "level_end", text='End')
         
         layout.prop(active_layer,"use_same_style")
 
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 2f02fa64cbb..6a9151f497b 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -370,11 +370,11 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
             rb->ChainShgrp, "normal_thickness_end", &ll->normal_thickness_end, 1);
         DRW_shgroup_uniform_vec3(rb->ChainShgrp, "normal_direction", normal_object_direction, 1);
 
-        DRW_shgroup_uniform_int(rb->ChainShgrp, "occlusion_level_start", &ll->qi_begin, 1);
+        DRW_shgroup_uniform_int(rb->ChainShgrp, "occlusion_level_start", &ll->level_start, 1);
         DRW_shgroup_uniform_int(rb->ChainShgrp,
                                 "occlusion_level_end",
-                                (ll->flags & LANPR_LINE_LAYER_USE_MULTIPLE_LEVELS) ? &ll->qi_end :
-                                                                                     &ll->qi_begin,
+                                (ll->flags & LANPR_LINE_LAYER_USE_MULTIPLE_LEVELS) ? &ll->level_end :
+                                                                                     &ll->level_start,
                                 1);
 
         DRW_shgroup_uniform_vec4(
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c
index 45a4903d51e..ef1b511a91e 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lanpr/lanpr_cpu.c
@@ -117,10 +117,10 @@ int ED_lanpr_max_occlusion_in_line_layers(SceneLANPR *lanpr)
   int max_occ = -1, max;
   for (lli = lanpr->line_layers.first; lli; lli = lli->next) {
     if (lli->flags & LANPR_LINE_LAYER_USE_MULTIPLE_LEVELS) {
-      max = MAX2(lli->qi_begin, lli->qi_end);
+      max = MAX2(lli->level_start, lli->level_end);
     }
     else {
-      max = lli->qi_begin;
+      max = lli->level_start;
     }
     max_occ = MAX2(max, max_occ);
   }
@@ -134,7 +134,7 @@ LANPR_LineLayer *ED_lanpr_new_line_layer(SceneLANPR *lanpr)
 
   int max_occ = ED_lanpr_max_occlusion_in_line_layers(lanpr);
 
-  ll->qi_begin = ll->qi_end = max_occ + 1;
+  ll->level_start = ll->level_end = max_occ + 1;
   ll->flags |= LANPR_LINE_LAYER_USE_SAME_STYLE;
   ll->thickness = 1.0f;
   copy_v3_fl(ll->color, 0.8);
@@ -2804,12 +2804,12 @@ int lanpr_count_leveled_edge_segment_count(ListBase *LineList, LANPR_LineLayer *
     for (rls = rl->segments.first; rls; rls = rls->next) {
 
       if (!(ll->flags & LANPR_LINE_LAYER_USE_MULTIPLE_LEVELS)) {
-        if (rls->occlusion == ll->qi_begin) {
+        if (rls->occlusion == ll->level_start) {
           Count++;
         }
       }
       else {
-        if (rls->occlusion >= ll->qi_begin && rls->occlusion <= ll->qi_end) {
+        if (rls->occlusion >= ll->level_start && rls->occlusion <= ll->level_end) {
           Count++;
         }
       }
@@ -2848,12 +2848,12 @@ void *lanpr_make_leveled_edge_vertex_array(LANPR_RenderBuffer *UNUSED(rb),
     for (rls = rl->segments.first; rls; rls = rls->next) {
       int use = 0;
       if (!(ll->flags & LANPR_LINE_LAYER_USE_MULTIPLE_LEVELS)) {
-        if (rls->occlusion == ll->qi_begin) {
+        if (rls->occlusion == ll->level_start) {
           use = 1;
         }
       }
       else {
-        if (rls->occlusion >= ll->qi_begin && rls->occlusion <= ll->qi_end) {
+        if (rls->occlusion >= ll->level_start && rls->occlusion <= ll->level_end) {
           use = 1;
         }
       }
@@ -3957,8 +3957,8 @@ static void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
                                               Object *ob,
                                               bGPDlayer *UNUSED(gpl),
                                               bGPDframe *gpf,
-                                              int qi_begin,
-                                              int qi_end,
+                                              int level_start,
+                                              int level_end,
                                               int material_nr,
                                               Collection *col,
                                               int types)
@@ -3994,7 +3994,7 @@ static void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
     if (!(rlc->type & types)) {
       continue;
     }
-    if (rlc->level > qi_end || rlc->level < qi_begin) {
+    if (rlc->level > level_end || rlc->level < level_start) {
       continue;
     }
     if (ob && &ob->id != rlc->object_ref->id.orig_id) {
diff --git a/source/blender/makesdna/DNA_lanpr_types.h b/source/blender/makesdna/DNA_lanpr_types.h
index 08ec1a12464..2ba468ba56c 100644
--- a/source/blender/makesdna/DNA_lanpr_types.h
+++ b/source/blender/makesdna/DNA_lanpr_types.h
@@ -101,8 +101,8 @@ typedef struct LANPR_LineLayer {
 
   int flags;
   int _pad1;
-  int qi_begin;
-  int qi_end;
+  int level_start;
+  int level_end;
 
   /** To be displayed on the list */
   char name[64];
diff --git a/source/blender/makesrna/intern/rna_lanpr.c b/source/blender/makesrna/intern/rna_lanpr.c
index 92450754661..1a4ef2aefd8 100644
--- a/source/blender/makesrna/intern/rna_lanpr.c
+++ b/source/blender/makesrna/intern/rna_lanpr.c
@@ -138,14 +138,14 @@ static void rna_def_lanpr_line_layer(BlenderRNA *brna)
   RNA_def_property_struct_type(prop, "LANPR_LineType");
   RNA_def_property_ui_text(prop, "Intersection", "Intersection line type");
 
-  prop = RNA_def_property(srna, "qi_begin", PROP_INT, PROP_NONE);
+  prop = RNA_def_property(srna, "level_start", PROP_INT, PROP_NONE);
   RNA_def_property_int_default(prop, 0);
-  RNA_def_property_ui_text(prop, "QI Begin", "QI Begin");
+  RNA_def_property_ui_text(prop, "Level Start", "Occlusion level start");
   RNA_def_property_range(prop, 0, 128);
 
-  prop = RNA_def_property(srna, "qi_end", PROP_INT, PROP_NONE);
+  prop = RNA_def_property(srna, "level_end", PROP_INT, PROP_NONE);
   RNA_def_property_int_default(prop, 0);
-  RNA_def_property_ui_text(prop, "QI End", "QI End");
+  RNA_def_property_ui_text(prop, "Level End", "Occlusion level end");
   RNA_def_property_range(prop, 0, 128);
 
   prop = RNA_def_property(srna, "thickness", PROP_FLOAT, PROP_NONE);



More information about the Bf-blender-cvs mailing list