[Bf-blender-cvs] [4aa84a312a4] soc-2019-npr: Fix line layer init level errors. Default follow world color

[YimingWu]

Commit: 4aa84a312a44a0c5389dd40be1cd41803a1969b9
Author: YimingWu
Date:   Mon Jul 8 15:11:16 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB4aa84a312a44a0c5389dd40be1cd41803a1969b9

Fix line layer init level errors. Default follow world color

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

M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/draw/engines/lanpr/lanpr_ops.c

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 2a3821a653f..b4b54f96f20 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -3529,9 +3529,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 
       sce->lanpr.enable_intersections = 1;
 
-      sce->lanpr.background_color[0] = 0.75;
-      sce->lanpr.background_color[1] = 0.75;
-      sce->lanpr.background_color[2] = 0.75;
+      /* default world background color */
+      copy_v3_fl(sce->lanpr.background_color,0.051);
       sce->lanpr.background_color[3] = 1;
 
       sce->lanpr.use_world_background = 1;
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index 81369d26e78..b06cf28bbf2 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -4443,7 +4443,7 @@ void SCENE_OT_lanpr_calculate_feature_lines(struct wmOperatorType *ot)
 int lanpr_max_occlusion_in_line_layers(SceneLANPR *lanpr)
 {
   LANPR_LineLayer *lli;
-  int max_occ = 0, max;
+  int max_occ = -1, max;
   for (lli = lanpr->line_layers.first; lli; lli = lli->next) {
     if (lli->use_multiple_levels) {
       max = MAX2(lli->qi_begin, lli->qi_end);
@@ -4465,9 +4465,7 @@ LANPR_LineLayer *lanpr_new_line_layer(SceneLANPR *lanpr)
   ll->qi_begin = ll->qi_end = max_occ + 1;
   ll->use_same_style = 1;
   ll->thickness = 1.0f;
-  ll->color[0] = 0.0f;
-  ll->color[1] = 0.0f;
-  ll->color[2] = 0.0f;
+  copy_v3_fl(ll->color,0.8);
   ll->color[3] = 1.0f;
   ll->enable_contour = 1;
   ll->enable_crease = 1;
@@ -4656,29 +4654,18 @@ int lanpr_auto_create_line_layer_exec(struct bContext *C, struct wmOperator *op)
 
   ll = lanpr_new_line_layer(lanpr);
   ll->thickness = 1.7;
-  ll->color[0] = 0;
-  ll->color[1] = 0;
-  ll->color[2] = 0;
 
   lanpr_enable_all_line_types_exec(C, op);
 
   ll = lanpr_new_line_layer(lanpr);
   ll->thickness = 0.9;
-  ll->qi_begin = 1;
-  ll->qi_end = 1;
-  ll->color[0] = 0.1;
-  ll->color[1] = 0.1;
-  ll->color[2] = 1;
+  copy_v3_fl(ll->color,0.6);
 
   lanpr_enable_all_line_types_exec(C, op);
 
   ll = lanpr_new_line_layer(lanpr);
   ll->thickness = 0.7;
-  ll->qi_begin = 2;
-  ll->qi_end = 2;
-  ll->color[0] = 0.2;
-  ll->color[1] = 0.2;
-  ll->color[2] = 0.2;
+  copy_v3_fl(ll->color,0.5);
 
   lanpr_enable_all_line_types_exec(C, op);