[Bf-blender-cvs] [47fc1e11db6] master: Nodes: ensure ui storage implicitely

[Jacques Lucke]

Commit: 47fc1e11db68e2d4c565156552beb87f98bbb927
Author: Jacques Lucke
Date:   Fri Feb 19 11:27:40 2021 +0100
Branches: master
https://developer.blender.org/rB47fc1e11db68e2d4c565156552beb87f98bbb927

Nodes: ensure ui storage implicitely

This makes it easier to use the api.

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

M	source/blender/blenkernel/BKE_node_ui_storage.hh
M	source/blender/blenkernel/intern/node_ui_storage.cc
M	source/blender/nodes/intern/node_geometry_exec.cc

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

diff --git a/source/blender/blenkernel/BKE_node_ui_storage.hh b/source/blender/blenkernel/BKE_node_ui_storage.hh
index 217f204f7bd..2084382aac5 100644
--- a/source/blender/blenkernel/BKE_node_ui_storage.hh
+++ b/source/blender/blenkernel/BKE_node_ui_storage.hh
@@ -84,8 +84,6 @@ struct NodeTreeUIStorage {
 void BKE_nodetree_ui_storage_free_for_context(bNodeTree &ntree,
                                               const NodeTreeEvaluationContext &context);
 
-void BKE_nodetree_ui_storage_ensure(bNodeTree &ntree);
-
 void BKE_nodetree_error_message_add(bNodeTree &ntree,
                                     const NodeTreeEvaluationContext &context,
                                     const bNode &node,
diff --git a/source/blender/blenkernel/intern/node_ui_storage.cc b/source/blender/blenkernel/intern/node_ui_storage.cc
index 4c8a5c824c4..e95d1ca3ef1 100644
--- a/source/blender/blenkernel/intern/node_ui_storage.cc
+++ b/source/blender/blenkernel/intern/node_ui_storage.cc
@@ -31,7 +31,7 @@ using blender::Map;
 using blender::StringRef;
 using blender::Vector;
 
-void BKE_nodetree_ui_storage_ensure(bNodeTree &ntree)
+static void ui_storage_ensure(bNodeTree &ntree)
 {
   if (ntree.ui_storage == nullptr) {
     ntree.ui_storage = new NodeTreeUIStorage();
@@ -89,7 +89,7 @@ void BKE_nodetree_error_message_add(bNodeTree &ntree,
                                     const NodeWarningType type,
                                     std::string message)
 {
-  BLI_assert(ntree.ui_storage != nullptr);
+  ui_storage_ensure(ntree);
   NodeTreeUIStorage &ui_storage = *ntree.ui_storage;
 
   node_error_message_log(ntree, node, message, type);
diff --git a/source/blender/nodes/intern/node_geometry_exec.cc b/source/blender/nodes/intern/node_geometry_exec.cc
index ebbb6f60b78..532f9955a62 100644
--- a/source/blender/nodes/intern/node_geometry_exec.cc
+++ b/source/blender/nodes/intern/node_geometry_exec.cc
@@ -37,8 +37,6 @@ void GeoNodeExecParams::error_message_add(const NodeWarningType type, std::strin
   }
   bNodeTree *btree_original = (bNodeTree *)DEG_get_original_id((ID *)btree_cow);
 
-  BKE_nodetree_ui_storage_ensure(*btree_original);
-
   const NodeTreeEvaluationContext context(*self_object_, *modifier_);
 
   BKE_nodetree_error_message_add(