Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-09-17 14:08:37 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-09-17 14:20:11 +0300
commit6ee2d10005a9e3f47ba6eed53d4e56b9e76f9842 (patch)
treecc14235e919a16242ac0d832bcab3c0a80195cf8 /source/blender/blenkernel/intern/scene.c
parentdf5fae1fcc9a45c2a38faa1e61522afa70830346 (diff)
Fix T69974: crashes in .blend files where 3D viewport was split
This was caused by a missing copy of the recently adding 3D viewport shading ID properties.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r--source/blender/blenkernel/intern/scene.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 71668f77efe..faf3d12fdad 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -318,6 +318,10 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons
flag_subdata);
}
+ if (sce_src->display.shading.prop) {
+ sce_dst->display.shading.prop = IDP_CopyProperty(sce_src->display.shading.prop);
+ }
+
BKE_sound_reset_scene_runtime(sce_dst);
/* Copy sequencer, this is local data! */