[Bf-blender-cvs] [55c1021be44] master: Cleanup: extract function to get node ui storage
Jacques Lucke
noreply at git.blender.org
Fri Feb 19 12:03:38 CET 2021
Commit: 55c1021be4493bd1e7335da96fffdc796359a3f7
Author: Jacques Lucke
Date: Fri Feb 19 12:03:21 2021 +0100
Branches: master
https://developer.blender.org/rB55c1021be4493bd1e7335da96fffdc796359a3f7
Cleanup: extract function to get node ui storage
This function will be used by multiple functions.
===================================================================
M source/blender/blenkernel/intern/node_ui_storage.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/node_ui_storage.cc b/source/blender/blenkernel/intern/node_ui_storage.cc
index e95d1ca3ef1..7bf8895262d 100644
--- a/source/blender/blenkernel/intern/node_ui_storage.cc
+++ b/source/blender/blenkernel/intern/node_ui_storage.cc
@@ -83,22 +83,30 @@ static void node_error_message_log(bNodeTree &ntree,
}
}
-void BKE_nodetree_error_message_add(bNodeTree &ntree,
- const NodeTreeEvaluationContext &context,
- const bNode &node,
- const NodeWarningType type,
- std::string message)
+static NodeUIStorage &find_node_ui_storage(bNodeTree &ntree,
+ const NodeTreeEvaluationContext &context,
+ const bNode &node)
{
ui_storage_ensure(ntree);
NodeTreeUIStorage &ui_storage = *ntree.ui_storage;
- node_error_message_log(ntree, node, message, type);
-
Map<std::string, NodeUIStorage> &node_tree_ui_storage =
ui_storage.context_map.lookup_or_add_default(context);
NodeUIStorage &node_ui_storage = node_tree_ui_storage.lookup_or_add_default_as(
StringRef(node.name));
+ return node_ui_storage;
+}
+
+void BKE_nodetree_error_message_add(bNodeTree &ntree,
+ const NodeTreeEvaluationContext &context,
+ const bNode &node,
+ const NodeWarningType type,
+ std::string message)
+{
+ node_error_message_log(ntree, node, message, type);
+
+ NodeUIStorage &node_ui_storage = find_node_ui_storage(ntree, context, node);
node_ui_storage.warnings.append({type, std::move(message)});
}
More information about the Bf-blender-cvs
mailing list