[Bf-blender-cvs] [96d470c0e2a] temp-lanpr-review: LANPR: Versioning code move to the latest.

[YimingWu]

Commit: 96d470c0e2a32fd32620dc969838222b581f9d06
Author: YimingWu
Date:   Fri Nov 22 17:37:15 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rB96d470c0e2a32fd32620dc969838222b581f9d06

LANPR: Versioning code move to the latest.

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/blenloader/intern/versioning_280.c

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 5402eec9637..8a05b618f03 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 5402eec9637b5c360e35bdd936d9e7a076d5df7f
+Subproject commit 8a05b618f031582c006c6f62b9e60619ab3eef8b
diff --git a/release/scripts/addons b/release/scripts/addons
index 249288e02af..67f1fbca148 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 249288e02afdcd024a64480ec29fa61be53dc5ec
+Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index f3beaf24199..ef6ef414d22 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit f3beaf241996d17feec0dee5f0888b0e9f55b4e3
+Subproject commit ef6ef414d22c2578fad99327743b925ab640a99c
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index e2587ab45a7..524c711bfd6 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1953,20 +1953,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
       }
     }
 
-    if (!DNA_struct_find(fd->filesdna, "SceneLANPR")) {
-      for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
-
-        scene->lanpr.crease_threshold = 0.7;
-
-        scene->lanpr.flags |= (LANPR_USE_CHAINING | LANPR_USE_INTERSECTIONS);
-
-        scene->lanpr.line_color[0] = 0.39;
-        scene->lanpr.line_color[1] = 0.12;
-        scene->lanpr.line_color[2] = 0.04;
-        scene->lanpr.line_color[3] = 1;
-      }
-    }
-
     if (!MAIN_VERSION_ATLEAST(bmain, 280, 15)) {
       for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
         scene->display.matcap_ssao_distance = 0.2f;
@@ -3669,22 +3655,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
         do_versions_seq_alloc_transform_and_crop(&scene->ed->seqbase);
       }
     }
-    for (Scene *sce = bmain->scenes.first; sce; sce = sce->id.next) {
-      sce->lanpr.crease_threshold = 0.7;
-
-      zero_v4(sce->lanpr.line_color);
-
-      sce->lanpr.flags |= (LANPR_USE_CHAINING | LANPR_USE_INTERSECTIONS);
-      sce->lanpr.chaining_image_threshold = 0.01f;
-      sce->lanpr.chaining_geometry_threshold = 0.0f;
-    }
-    for (Collection *co = bmain->collections.first; co; co = co->id.next) {
-      co->lanpr.contour.use = 1;
-      co->lanpr.crease.use = 1;
-      co->lanpr.material.use = 1;
-      co->lanpr.edge_mark.use = 1;
-      co->lanpr.intersection.use = 1;
-    }
   }
 
   if (!MAIN_VERSION_ATLEAST(bmain, 280, 75)) {
@@ -4008,5 +3978,25 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
         br->pose_smooth_iterations = 4;
       }
     }
+    
+    if (!DNA_struct_find(fd->filesdna, "SceneLANPR")) {
+      for (Collection *co = bmain->collections.first; co; co = co->id.next) {
+        co->lanpr.contour.use = 1;
+        co->lanpr.crease.use = 1;
+        co->lanpr.material.use = 1;
+        co->lanpr.edge_mark.use = 1;
+        co->lanpr.intersection.use = 1;
+      }
+      for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
+
+        scene->lanpr.crease_threshold = 0.7;
+
+        scene->lanpr.flags |= (LANPR_USE_CHAINING | LANPR_USE_INTERSECTIONS);
+
+        zero_v4(scene->lanpr.line_color);
+
+        scene->lanpr.line_color[3] = 1;
+      }
+    }
   }
 }