Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Edwards <contact@steamreview.org>2014-01-15 19:37:03 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-01-15 19:47:53 +0400
commit1f2136b329c1c457f8f2a77c26d0fdffc635e7a2 (patch)
tree53d91bba6000bea9d9aaf683261936167ab6627b /source/blender/blenkernel/intern/image.c
parent8c444958fcba92135b22893ae5da53bc31e96eb6 (diff)
Python/Depsgraph: bpy.data.*.is_updated now detects add/remove of any datablock.
Previously this only worked for some datablocks relevant to rendering, now it can be used to detect if any type of datablock was added or removed (but not yet to detect if it was modified, we need many more depsgraph tags for that). Most of the changes are some function parameter changes, the important parts are the DAG_id_type_tag calls. Reviewed By: sergey, brecht Differential Revision: https://developer.blender.org/D195
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
-rw-r--r--source/blender/blenkernel/intern/image.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 3ccc95635a3..db4a639d91c 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -295,7 +295,7 @@ static Image *image_alloc(Main *bmain, const char *name, short source, short typ
{
Image *ima;
- ima = BKE_libblock_alloc(&bmain->image, ID_IM, name);
+ ima = BKE_libblock_alloc(bmain, ID_IM, name);
if (ima) {
ima->ok = IMA_OK;
@@ -555,7 +555,7 @@ void BKE_image_merge(Image *dest, Image *source)
}
BLI_spin_unlock(&image_spin);
- BKE_libblock_free(&G.main->image, source);
+ BKE_libblock_free(G.main, source);
}
}