[Bf-blender-cvs] [73012ab1f7a] refactor-idprop-ui-data: Merge branch 'master' into refactor-idprop-ui-data

[Hans Goudey]

Commit: 73012ab1f7a2feeef0c5c18a869f5a6f0120c8fa
Author: Hans Goudey
Date:   Mon Jul 12 21:43:40 2021 -0400
Branches: refactor-idprop-ui-data
https://developer.blender.org/rB73012ab1f7a2feeef0c5c18a869f5a6f0120c8fa

Merge branch 'master' into refactor-idprop-ui-data

===================================================================



===================================================================

diff --cc source/blender/modifiers/intern/MOD_nodes.cc
index 877ddea16a1,9af2472f2c6..633fd50a22d
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@@ -567,24 -734,9 +570,11 @@@ static void initialize_group_input(Node
      blender::nodes::socket_cpp_value_get(socket, r_value);
      return;
    }
 -  property_type->init_cpp_value(*property, r_value);
 +
 +  init_socket_cpp_value_from_property(
 +      *property, static_cast<eNodeSocketDatatype>(socket.type), r_value);
  }
  
- static void reset_tree_ui_storage(Span<const blender::nodes::NodeTreeRef *> trees,
-                                   const Object &object,
-                                   const ModifierData &modifier)
- {
-   const NodeTreeEvaluationContext context = {object, modifier};
- 
-   for (const blender::nodes::NodeTreeRef *tree : trees) {
-     bNodeTree *btree_cow = tree->btree();
-     bNodeTree *btree_original = (bNodeTree *)DEG_get_original_id((ID *)btree_cow);
-     BKE_nodetree_ui_storage_free_for_context(*btree_original, context);
-   }
- }
- 
  static Vector<SpaceSpreadsheet *> find_spreadsheet_editors(Main *bmain)
  {
    wmWindowManager *wm = (wmWindowManager *)bmain->wm.first;