diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-11-09 21:47:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-11-09 23:00:53 +0300 |
| commit | 865796375bcfa6be4288cca4243dddcb4092f70b (patch) | |
| tree | 5264d4b9b0f9d392b6e1b942e0f6fd802de1fff4 /source/blender/blenkernel/intern/scene.c | |
| parent | cf959a879eb5ffbdfa573c5f3a00965e69d7a976 (diff) | |
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library.
We have callbacks for that, they also do some checks and help ensure things are done
correctly. Only place where this is assumed not true is blenloader (since here we
may affect refcount of library IDs as well...).
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 6fe92a4ac23..82a040f4ca0 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -368,7 +368,7 @@ void BKE_scene_free(Scene *sce) base = sce->base.first; while (base) { - base->object->id.us--; + id_us_min(&base->object->id); base = base->next; } /* do not free objects! */ @@ -378,7 +378,7 @@ void BKE_scene_free(Scene *sce) /* since the grease pencil data is freed before the scene. * since grease pencil data is not (yet?), shared between objects * its probably safe not to do this, some save and reload will free this. */ - sce->gpd->id.us--; + id_us_min(&sce->gpd->id); #endif sce->gpd = NULL; } |