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

[YimingWu]

Commit: 11c94ad244e4e9cde15b697f27e091fda5551f16
Author: YimingWu
Date:   Mon Sep 21 22:40:23 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB11c94ad244e4e9cde15b697f27e091fda5551f16

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 aa30496cc83,39bb19c009a..a5c5704c3b7
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@@ -223,22 -223,16 +223,32 @@@ static void scene_init_data(ID *id
    BKE_view_layer_add(scene, "View Layer", NULL, VIEWLAYER_ADD_NEW);
  }
  
+ static void scene_copy_markers(Scene *scene_dst, const Scene *scene_src, const int flag)
+ {
+   BLI_duplicatelist(&scene_dst->markers, &scene_src->markers);
+   LISTBASE_FOREACH (TimeMarker *, marker, &scene_dst->markers) {
+     if (marker->prop != NULL) {
+       marker->prop = IDP_CopyProperty_ex(marker->prop, flag);
+     }
+   }
+ }
+ 
 +static void BKE_lineart_free_everything(Scene *s)
 +{
 +#if 0
 +  SceneLineart *lineart = &s->lineart;
 +#endif
 +  /* Nothing to free. Reserved for future. */
 +}
 +
 +static void BKE_lineart_copy_data(const Scene *from, Scene *to)
 +{
 +#if 0
 +  const SceneLineart *lineart = &from->lineart;
 +#endif
 +  /*  Line layer removed. Currently nothing to do. Reserved for future. */
 +}
 +
  static void scene_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const int flag)
  {
    Scene *scene_dst = (Scene *)id_dst;