[Bf-blender-cvs] [8c488cb97f0] master: Fix T52315: Crash on duplicating Scene without world.
Bastien Montagne
noreply at git.blender.org
Wed Aug 9 10:55:42 CEST 2017
Commit: 8c488cb97f0cf3b445c5527be72542d68242db93
Author: Bastien Montagne
Date: Wed Aug 9 10:43:04 2017 +0200
Branches: master
https://developer.blender.org/rB8c488cb97f0cf3b445c5527be72542d68242db93
Fix T52315: Crash on duplicating Scene without world.
Regression from rBa7b3047cefcbf, to be backported to 2.79.
Like... seriously... :|
===================================================================
M source/blender/editors/object/object_relations.c
===================================================================
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 5b6fe96861d..d5b516257a1 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -2137,7 +2137,9 @@ void ED_object_single_users(Main *bmain, Scene *scene, const bool full, const bo
IDP_RelinkProperty(scene->gpd->id.properties);
}
- IDP_RelinkProperty(scene->world->id.properties);
+ if (scene->world) {
+ IDP_RelinkProperty(scene->world->id.properties);
+ }
if (scene->clip) {
IDP_RelinkProperty(scene->clip->id.properties);
More information about the Bf-blender-cvs
mailing list