[Bf-blender-cvs] [78490a78373] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into lanpr-under-gp

[YimingWu]

Commit: 78490a7837348b43975c5350ae172cd11be1c260
Author: YimingWu
Date:   Thu Jun 11 12:37:54 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB78490a7837348b43975c5350ae172cd11be1c260

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

# Conflicts:
#	source/blender/blenkernel/intern/scene.c

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



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

diff --cc source/blender/blenkernel/intern/scene.c
index 2a406b7e4d5,7cf424f53e0..a46c1ed0586
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@@ -1013,12 -872,6 +1026,9 @@@ Scene *BKE_scene_duplicate(Main *bmain
        BKE_sequencer_editing_free(sce_copy, true);
      }
  
 +    /*  LANPR  data */
 +    BKE_lanpr_copy_data(sce, sce_copy);
- 
-     /* NOTE: part of SCE_COPY_FULL operations
-      * are done outside of blenkernel with ED_object_single_users! */
- 
++    
      return sce_copy;
    }
  }