diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-15 19:55:23 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-15 19:55:23 +0300 |
| commit | 68ffb2a2672a0e944e5e4fdf0f31c7223c2f1920 (patch) | |
| tree | cdac8fad1dadafcbb7c157f96c0a083c44fdf815 /source/blender/depsgraph/intern/depsgraph.cc | |
| parent | 5cb70a89e10a83eab689d1de1060c54b3cb3137d (diff) | |
| parent | 50ef25d73f987f1b6973fa26b7349c649ac23567 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 1227db4c1bb..995157f5c9a 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -263,7 +263,7 @@ DepsNode *Depsgraph::find_node_from_pointer(const PointerRNA *ptr, TimeSourceDepsNode *Depsgraph::add_time_source() { if (time_source == NULL) { - DepsNodeFactory *factory = deg_get_node_factory(DEG_NODE_TYPE_TIMESOURCE); + DepsNodeFactory *factory = deg_type_get_factory(DEG_NODE_TYPE_TIMESOURCE); time_source = (TimeSourceDepsNode *)factory->create_node(NULL, "", "Time Source"); } return time_source; @@ -284,7 +284,7 @@ IDDepsNode *Depsgraph::add_id_node(ID *id, bool do_tag, ID *id_cow_hint) BLI_assert((id->tag & LIB_TAG_COPY_ON_WRITE) == 0); IDDepsNode *id_node = find_id_node(id); if (!id_node) { - DepsNodeFactory *factory = deg_get_node_factory(DEG_NODE_TYPE_ID_REF); + DepsNodeFactory *factory = deg_type_get_factory(DEG_NODE_TYPE_ID_REF); id_node = (IDDepsNode *)factory->create_node(id, "", id->name); id_node->init_copy_on_write(id_cow_hint); if (do_tag) { |