diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-03-18 03:28:56 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-03-18 03:32:17 +0300 |
| commit | 7bbd24e1d5c52a08205f0cc5921c305397dcac49 (patch) | |
| tree | 2f93e627e8924de4199da0dd0c636ebd1b77152f /source/blender/depsgraph | |
| parent | 9683976b0229e01aca3ae0f9293d9f837efecb1c (diff) | |
| parent | de6d6e171e950ab59e8499f310a91ee7fc18c9f8 (diff) | |
Merge branch 'master' into geometry-nodes-read-only-instances
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 2 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph.h | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 96b4da34347..3cc2ec02165 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -2085,7 +2085,7 @@ void DepsgraphRelationBuilder::build_object_data_geometry(Object *object) if (mti->updateDepsgraph) { DepsNodeHandle handle = create_node_handle(obdata_ubereval_key); ctx.node = reinterpret_cast<::DepsNodeHandle *>(&handle); - mti->updateDepsgraph(md, &ctx); + mti->updateDepsgraph(md, &ctx, graph_->mode); } if (BKE_object_modifier_gpencil_use_time(object, md)) { TimeSourceKey time_src_key; diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h index 14c91834739..df8c8215d2f 100644 --- a/source/blender/depsgraph/intern/depsgraph.h +++ b/source/blender/depsgraph/intern/depsgraph.h @@ -33,9 +33,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_ID.h" /* for ID_Type */ - -#include "BKE_main.h" /* for MAX_LIBARRAY */ +#include "DNA_ID.h" /* for ID_Type and INDEX_ID_MAX */ #include "BLI_threads.h" /* for SpinLock */ @@ -111,10 +109,10 @@ struct Depsgraph { bool need_update; /* Indicates which ID types were updated. */ - char id_type_updated[MAX_LIBARRAY]; + char id_type_updated[INDEX_ID_MAX]; /* Indicates type of IDs present in the depsgraph. */ - char id_type_exist[MAX_LIBARRAY]; + char id_type_exist[INDEX_ID_MAX]; /* Quick-Access Temp Data ............. */ |