[Bf-blender-cvs] [349f7b8f321] soc-2019-npr: Merge remote-tracking branch 'origin/greasepencil-object' into soc-2019-npr

[YimingWu]

Commit: 349f7b8f3218eedb049e0ba1867d8b8a34c66db5
Author: YimingWu
Date:   Wed Jul 24 09:03:51 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB349f7b8f3218eedb049e0ba1867d8b8a34c66db5

Merge remote-tracking branch 'origin/greasepencil-object' into soc-2019-npr

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 426bad92f8a,cb2b64957f0..29ae1964156
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3518,40 -3493,9 +3518,38 @@@ void blo_do_versions_280(FileData *fd, 
          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;
 +
 +      sce->lanpr.line_thickness = 1.5;
 +      sce->lanpr.depth_clamp = 0.001;
 +      sce->lanpr.depth_strength = 800;
 +      sce->lanpr.normal_clamp = 2;
 +      sce->lanpr.normal_strength = 10;
 +
 +      sce->lanpr.enable_intersections = 1;
 +
 +      /* 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;
 +
 +      zero_v4(sce->lanpr.line_color);
 +
 +      sce->lanpr.enable_intersections = 1;
 +      sce->lanpr.enable_chaining = 1;
 +      sce->lanpr.chaining_image_threshold = 0.01f;
 +      sce->lanpr.chaining_geometry_threshold = 0.0f;
 +
 +      sce->lanpr.disable_edge_splits = 1;
 +    }
 +    for (Collection *co = bmain->collections.first; co; co = co->id.next) {
 +      co->lanpr.types = COLLECTION_FEATURE_LINE_ALL;
 +    }
    }
  
-   {
-     /* Versioning code until next subversion bump goes here. */
- 
+   if (!MAIN_VERSION_ATLEAST(bmain, 280, 75)) {
      for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
        if (scene->master_collection != NULL) {
          scene->master_collection->flag &= ~(COLLECTION_RESTRICT_VIEWPORT |