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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-04-18 19:04:38 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-04-18 19:05:37 +0300
commitec0756af6c75ae37efb0772eecb069f3930eed46 (patch)
tree3a9848e1c95c3f118157b9650e140dd70857928a /source/blender/blenkernel/intern/object_update.c
parent3701cf785cf58a7c4c517bd217d76738ee28fd6e (diff)
Depsgraph: Fix base flag flush for objects from set scene
Fixes view_layer_background_set regression test. This makes Dalai happy! :)
Diffstat (limited to 'source/blender/blenkernel/intern/object_update.c')
-rw-r--r--source/blender/blenkernel/intern/object_update.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 81f15d265a2..d043fcc9d1c 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -444,10 +444,10 @@ void BKE_object_data_select_update(Depsgraph *UNUSED(depsgraph),
}
}
-void BKE_object_eval_flush_base_flags(Depsgraph *depsgraph,
+void BKE_object_eval_flush_base_flags(Depsgraph *UNUSED(depsgraph),
+ ViewLayer *view_layer,
Object *object, int base_index, bool is_from_set)
{
- ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph);
BLI_assert(view_layer->object_bases_array != NULL);
BLI_assert(base_index >= 0);
BLI_assert(base_index < MEM_allocN_len(view_layer->object_bases_array) / sizeof(Base *));