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/editors/object
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/editors/object')
-rw-r--r--source/blender/editors/object/object_add.c2
-rw-r--r--source/blender/editors/object/object_shapekey.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index c2fbd09281c..c6dcc0b6723 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1047,7 +1047,7 @@ void ED_base_object_free_and_unlink(Main *bmain, Scene *scene, Base *base)
DAG_id_type_tag(bmain, ID_OB);
BKE_scene_base_unlink(scene, base);
object_delete_check_glsl_update(base->object);
- BKE_libblock_free_us(&bmain->object, base->object);
+ BKE_libblock_free_us(bmain, base->object);
if (scene->basact == base) scene->basact = NULL;
MEM_freeN(base);
}
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c
index 5d10d67f0c9..57cd464b7ad 100644
--- a/source/blender/editors/object/object_shapekey.c
+++ b/source/blender/editors/object/object_shapekey.c
@@ -103,7 +103,7 @@ static bool ED_object_shape_key_remove_all(Main *bmain, Object *ob)
case ID_LT: ((Lattice *)key->from)->key = NULL; break;
}
- BKE_libblock_free_us(&(bmain->key), key);
+ BKE_libblock_free_us(bmain, key);
return true;
}
@@ -161,7 +161,7 @@ static bool ED_object_shape_key_remove(Main *bmain, Object *ob)
case ID_LT: ((Lattice *)key->from)->key = NULL; break;
}
- BKE_libblock_free_us(&(bmain->key), key);
+ BKE_libblock_free_us(bmain, key);
}
return true;