[Bf-blender-cvs] [677dc13e129] node-tree-update-refactor: Merge branch 'master' into node-tree-update-refactor
Jacques Lucke
noreply at git.blender.org
Mon Nov 15 19:09:22 CET 2021
Commit: 677dc13e129cba3b2f1448d491622a18eb1b998b
Author: Jacques Lucke
Date: Mon Nov 15 18:07:04 2021 +0100
Branches: node-tree-update-refactor
https://developer.blender.org/rB677dc13e129cba3b2f1448d491622a18eb1b998b
Merge branch 'master' into node-tree-update-refactor
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/node.cc
index 468a597e242,98c31eab7cd..4fa2e0c379a
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -4541,21 -4542,8 +4539,9 @@@ void ntreeUpdateAllNew(Main *main
}
}
FOREACH_NODETREE_END;
+ BKE_node_tree_update_main(main, nullptr);
}
- static FieldInferencingInterface *node_field_inferencing_interface_copy(
- const FieldInferencingInterface &field_inferencing_interface)
- {
- return new FieldInferencingInterface(field_inferencing_interface);
- }
-
- static void node_field_inferencing_interface_free(
- const FieldInferencingInterface *field_inferencing_interface)
- {
- delete field_inferencing_interface;
- }
-
namespace blender::bke::node_field_inferencing {
static bool is_field_socket_type(eNodeSocketDatatype type)
More information about the Bf-blender-cvs
mailing list