diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-09 11:43:04 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-08-17 15:07:18 +0300 |
| commit | 0146ab2fd57cb23416e93e17bf4c62bc2c169ca0 (patch) | |
| tree | 4ca4593ae99bca786d13bda0ea074d4e37047f8b /source | |
| parent | e54df78c8273a5473b2ad60b7317f64bd42791e4 (diff) | |
Fix T52315: Crash on duplicating Scene without world.
Regression from rBa7b3047cefcbf, to be backported to 2.79.
Like... seriously... :|
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |