diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-24 10:00:13 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-24 10:00:13 +0300 |
| commit | 8ccb27fc0ad45661f627aff552a0a9615633dea7 (patch) | |
| tree | c476c8a34f009bf6b7435f00ee8d79876c36ce4d /source/blender/blenkernel | |
| parent | 7b79216c5463a025554d9bbc7e4f1fc150742b52 (diff) | |
| parent | 65d4314b8e43c0d1e30ec105a929a1adf4268d01 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/scene.c
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index c16adabbc8c..8fdf207ad68 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -403,6 +403,7 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) for (ViewLayer *view_layer_dst = sce_copy->view_layers.first; view_layer_dst; view_layer_dst = view_layer_dst->next) { for (FreestyleLineSet *lineset = view_layer_dst->freestyle_config.linesets.first; lineset; lineset = lineset->next) { if (lineset->linestyle) { + id_us_min(&lineset->linestyle->id); /* XXX Not copying anim/actions here? */ BKE_id_copy_ex(bmain, (ID *)lineset->linestyle, (ID **)&lineset->linestyle, 0, false); } @@ -411,6 +412,7 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) /* Full copy of world (included animations) */ if (sce_copy->world) { + id_us_min(&sce_copy->world->id); BKE_id_copy_ex(bmain, (ID *)sce_copy->world, (ID **)&sce_copy->world, LIB_ID_COPY_ACTIONS, false); } @@ -420,6 +422,7 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) /* Full copy of GreasePencil. */ /* XXX Not copying anim/actions here? */ if (sce_copy->gpd) { + id_us_min(&sce_copy->gpd->id); BKE_id_copy_ex(bmain, (ID *)sce_copy->gpd, (ID **)&sce_copy->gpd, 0, false); } } @@ -433,7 +436,8 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) /* NOTE: part of SCE_COPY_LINK_DATA and SCE_COPY_FULL operations * are done outside of blenkernel with ED_object_single_users! */ - /* camera */ + /* camera */ + /* XXX This is most certainly useless? Object have not yet been duplicated... */ if (ELEM(type, SCE_COPY_LINK_DATA, SCE_COPY_FULL)) { ID_NEW_REMAP(sce_copy->camera); } |