archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Depsgraph: Fix base flag flush for objects from set scene

Browse Source 
Fixes view_layer_background_set regression test.

This makes Dalai happy! :)
This commit is contained in:
Sergey Sharybin
2018-04-18 18:04:38 +02:00
parent 3701cf785c
commit ec0756af6c
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_object.h
View File

@@ -248,6 +248,7 @@ void BKE_object_data_select_update(
void BKE_object_eval_flush_base_flags( void BKE_object_eval_flush_base_flags(
struct Depsgraph *depsgraph, struct Depsgraph *depsgraph,
struct ViewLayer *view_layer,
struct Object *object, int base_index, struct Object *object, int base_index,
const bool is_from_set); const bool is_from_set);

4
source/blender/blenkernel/intern/object_update.c
View File

@@ -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) 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(view_layer->object_bases_array != NULL);
BLI_assert(base_index >= 0); BLI_assert(base_index >= 0);
BLI_assert(base_index < MEM_allocN_len(view_layer->object_bases_array) / sizeof(Base *)); BLI_assert(base_index < MEM_allocN_len(view_layer->object_bases_array) / sizeof(Base *));

1
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@@ -533,6 +533,7 @@ void DepsgraphNodeBuilder::build_object_flags(
DEG_NODE_TYPE_LAYER_COLLECTIONS, DEG_NODE_TYPE_LAYER_COLLECTIONS,
function_bind(BKE_object_eval_flush_base_flags, function_bind(BKE_object_eval_flush_base_flags,
_1, _1,
view_layer_,
object_cow, base_index, object_cow, base_index,
is_from_set), is_from_set),
DEG_OPCODE_OBJECT_BASE_FLAGS); DEG_OPCODE_OBJECT_BASE_FLAGS);