[Bf-blender-cvs] [e21a36b69ae] temp-lanpr-staging: Cleanup: Use "level_start".
YimingWu
noreply at git.blender.org
Fri Aug 16 03:27:36 CEST 2019
Commit: e21a36b69aea038fea035f64529ad440f65465c6
Author: YimingWu
Date: Sun Aug 11 17:22:43 2019 +0800
Branches: temp-lanpr-staging
https://developer.blender.org/rBe21a36b69aea038fea035f64529ad440f65465c6
Cleanup: Use "level_start".
===================================================================
M release/scripts/startup/bl_ui/properties_collection.py
M release/scripts/startup/bl_ui/properties_lanpr.py
M source/blender/draw/engines/lanpr/lanpr_cpu.c
M source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl
M source/blender/editors/lanpr/lanpr_cpu.c
M source/blender/makesdna/DNA_collection_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_collection.c
M source/blender/makesrna/intern/rna_modifier.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py
index 94b2a1aabd8..6393101fef3 100644
--- a/release/scripts/startup/bl_ui/properties_collection.py
+++ b/release/scripts/startup/bl_ui/properties_collection.py
@@ -93,10 +93,10 @@ class COLLECTION_PT_lanpr_collection(CollectionButtonsPanel, Panel):
if lanpr.use_multiple_levels:
col = layout.column(align=True)
- col.prop(lanpr,'level_begin',text="Level Begin")
+ col.prop(lanpr,'level_start',text="Level Begin")
col.prop(lanpr,'level_end',text="End")
else:
- layout.prop(lanpr,'level_begin',text="Level")
+ layout.prop(lanpr,'level_start',text="Level")
layout.prop(lanpr,'enable_contour')
layout.prop(lanpr,'enable_crease')
diff --git a/release/scripts/startup/bl_ui/properties_lanpr.py b/release/scripts/startup/bl_ui/properties_lanpr.py
index c895eb522e0..37c65640dbc 100644
--- a/release/scripts/startup/bl_ui/properties_lanpr.py
+++ b/release/scripts/startup/bl_ui/properties_lanpr.py
@@ -68,10 +68,10 @@ class OBJECT_PT_lanpr_settings(LanprButtonsPanel, Panel):
layout.prop(md,'use_multiple_levels', text="Multiple Levels")
if md.use_multiple_levels:
col = layout.column(align=True)
- col.prop(md,'level_begin')
+ col.prop(md,'level_start')
col.prop(md,'level_end', text="End")
else:
- layout.prop(md,'level_begin', text="Level")
+ layout.prop(md,'level_start', text="Level")
layout.prop(md,'enable_contour')
layout.prop(md,'enable_crease')
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 047cb6850be..1944e30cb9f 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -332,7 +332,7 @@ 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_begin", &ll->qi_begin, 1);
+ DRW_shgroup_uniform_int(rb->ChainShgrp, "occlusion_level_start", &ll->qi_begin, 1);
DRW_shgroup_uniform_int(rb->ChainShgrp,
"occlusion_level_end",
ll->use_multiple_levels ? &ll->qi_end : &ll->qi_begin,
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 6db3e4fa5c9..3e867959bf3 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
@@ -27,7 +27,7 @@ uniform int enable_material;
uniform int enable_edge_mark;
uniform int enable_intersection;
-uniform int occlusion_level_begin;
+uniform int occlusion_level_start;
uniform int occlusion_level_end;
// implement these later.
@@ -238,7 +238,7 @@ void main()
{
int level = gLevel[1];
- if (occlusion_level_begin > level || occlusion_level_end < level)
+ if (occlusion_level_start > level || occlusion_level_end < level)
return;
float asp1 = output_viewport.z / output_viewport.w;
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c
index 1e8b72f4362..7d15ad7ad41 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lanpr/lanpr_cpu.c
@@ -2641,10 +2641,10 @@ static int lanpr_max_occlusion_in_collections(Collection *c)
int max_occ = 0;
int max;
if (c->lanpr.use_multiple_levels) {
- max = MAX2(c->lanpr.level_begin, c->lanpr.level_end);
+ max = MAX2(c->lanpr.level_start, c->lanpr.level_end);
}
else {
- max = c->lanpr.level_begin;
+ max = c->lanpr.level_start;
}
max_occ = MAX2(max, max_occ);
@@ -2672,10 +2672,10 @@ static int lanpr_max_occlusion_in_targets(Depsgraph *depsgraph)
FeatureLineModifierData *flmd = (FeatureLineModifierData *)md;
if (flmd->target) {
if (flmd->use_multiple_levels) {
- max = MAX2(flmd->level_begin, flmd->level_end);
+ max = MAX2(flmd->level_start, flmd->level_end);
}
else {
- max = flmd->level_begin;
+ max = flmd->level_start;
}
max_occ = MAX2(max, max_occ);
}
@@ -4044,9 +4044,9 @@ static void lanpr_update_gp_strokes_recursive(
ob,
gpl,
gpf,
- flmd->level_begin,
+ flmd->level_start,
flmd->use_multiple_levels ? flmd->level_end :
- flmd->level_begin,
+ flmd->level_start,
flmd->material,
NULL,
flmd->types);
@@ -4109,9 +4109,9 @@ static void lanpr_update_gp_strokes_collection(
NULL,
gpl,
gpf,
- col->lanpr.level_begin,
+ col->lanpr.level_start,
col->lanpr.use_multiple_levels ? col->lanpr.level_end :
- col->lanpr.level_begin,
+ col->lanpr.level_start,
col->lanpr.material,
col,
col->lanpr.types);
diff --git a/source/blender/makesdna/DNA_collection_types.h b/source/blender/makesdna/DNA_collection_types.h
index 1cb756f73e0..4b1a86cd7b1 100644
--- a/source/blender/makesdna/DNA_collection_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@ -60,7 +60,7 @@ typedef struct CollectionLANPR {
int layer;
int material;
int use_multiple_levels;
- int level_begin;
+ int level_start;
int level_end;
} CollectionLANPR;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index efb38b582e3..a975ac3cf72 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1973,7 +1973,7 @@ typedef struct FeatureLineModifierData {
int material;
int use_multiple_levels;
- int level_begin;
+ int level_start;
int level_end;
} FeatureLineModifierData;
diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c
index 12fdebbb8ca..d7db437e662 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -433,7 +433,7 @@ static void rna_def_collection_lanpr(BlenderRNA *brna, StructRNA *srna)
RNA_def_property_boolean_sdna(prop, NULL, "use_multiple_levels", 0);
RNA_def_property_ui_text(prop, "Multiple", "Use multiple occlusion levels");
- prop = RNA_def_property(srna, "level_begin", PROP_INT, PROP_NONE);
+ prop = RNA_def_property(srna, "level_start", PROP_INT, PROP_NONE);
RNA_def_property_range(prop, 0, 255);
RNA_def_property_ui_range(prop, 0, 255, 1, -1);
RNA_def_property_ui_text(prop, "Level", "Occlusion level");
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index a8263685b15..b62c4f374b1 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -5996,7 +5996,7 @@ static void rna_def_modifier_featureline(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Multiple", "Use multiple occlusion levels");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop = RNA_def_property(srna, "level_begin", PROP_INT, PROP_NONE);
+ prop = RNA_def_property(srna, "level_start", PROP_INT, PROP_NONE);
RNA_def_property_range(prop, 0, 255);
RNA_def_property_ui_range(prop, 0, 255, 1, -1);
RNA_def_property_ui_text(prop, "Level", "Occlusion level");
More information about the Bf-blender-cvs
mailing list