[Bf-blender-cvs] [1c2a22bb185] soc-2019-npr: LANPR: Improvements of disable_edge_splits function.

[YimingWu]

Commit: 1c2a22bb1856376a111907e953cc8ab9ccb09d35
Author: YimingWu
Date:   Fri Jul 5 07:55:15 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB1c2a22bb1856376a111907e953cc8ab9ccb09d35

LANPR: Improvements of disable_edge_splits function.

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

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

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

diff --git a/source/blender/blenloader/intern/versioning_280.c 
b/source/blender/blenloader/intern/versioning_280.c
index 19e14da39cb..1188ff080f3 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -3543,6 +3543,8 @@ void blo_do_versions_280(FileData *fd, Library 
*UNUSED(lib), Main *bmain)
       sce->lanpr.enable_chaining = 1;
       sce->lanpr.chaining_image_threshold = 0.01;
       sce->lanpr.chaining_geometry_threshold = 0.1;
+
+      sce->lanpr.disable_edge_splits = 1;
     }
     for (Collection *co = bmain->collections.first; co; co = co->id.next) {
       co->lanpr.types = COLLECTION_FEATURE_LINE_ALL;
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.c 
b/source/blender/draw/engines/lanpr/lanpr_access.c
index 27c9357dfcd..235fd2f153e 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.c
+++ b/source/blender/draw/engines/lanpr/lanpr_access.c
@@ -140,7 +140,7 @@ bool lanpr_dpix_shader_error()
 
 bool lanpr_disable_edge_splits(Scene *s)
 {
-  return s->lanpr.disable_edge_splits;
+  return (s->lanpr.enabled && s->lanpr.disable_edge_splits);
 }
 
 void lanpr_copy_data(Scene *from, Scene *to)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs