diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-08-09 16:08:06 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-08-09 16:08:06 +0300 |
| commit | 6883f10f141d51cf2427183a85f11fd87a8915ad (patch) | |
| tree | 620f7e5eaa8fdbddd9ef709e699e66ff87237413 /source/blender/editors/object | |
| parent | ed500ac8c751046c005c2988775bd745252f4939 (diff) | |
| parent | 176ad9ecdd4efca4dbe33b9c3a003c16e3706433 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object')
| -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 e7c3ed38296..7e10cbeeb82 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2053,7 +2053,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); |