[Bf-blender-cvs] [0146ab2fd57] blender-v2.79-release: Fix T52315: Crash on duplicating Scene without world.

Bastien Montagne noreply at git.blender.org
Thu Aug 17 14:45:06 CEST 2017


Commit: 0146ab2fd57cb23416e93e17bf4c62bc2c169ca0
Author: Bastien Montagne
Date:   Wed Aug 9 10:43:04 2017 +0200
Branches: blender-v2.79-release
https://developer.blender.org/rB0146ab2fd57cb23416e93e17bf4c62bc2c169ca0

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 3284af2df69..8b8f4c563d9 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