[Bf-blender-cvs] [9caa9cdd84f] temp-node-error-messages: Add CLOG printing, some cleanup

[Hans Goudey]

Commit: 9caa9cdd84f8de5d1917730c841009e42ce99f2f
Author: Hans Goudey
Date:   Tue Feb 2 20:41:37 2021 -0600
Branches: temp-node-error-messages
https://developer.blender.org/rB9caa9cdd84f8de5d1917730c841009e42ce99f2f

Add CLOG printing, some cleanup

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

M	source/blender/blenkernel/intern/node.cc
M	source/blender/modifiers/intern/MOD_nodes.cc

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

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 7855ce603f4..5cc6b9647f5 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -125,6 +125,17 @@ void BKE_nodetree_error_message_add(bNodeTree *ntree,
 
   NodeWarning warning = {type, BLI_strdup(message)};
 
+  switch (type) {
+    case NODE_WARNING_ERROR:
+      CLOG_ERROR(
+          &LOG, "Node Tree: \"%s\", Node: \"%s\", %s", ntree->id.name + 2, node->name, message);
+      break;
+    case NODE_WARNING_INFO:
+      CLOG_INFO(
+          &LOG, 2, "Node Tree: \"%s\", Node: \"%s\", %s", ntree->id.name + 2, node->name, message);
+      break;
+  }
+
   runtime->error_messages.add(node->name, warning);
 }
 
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 0fc28f02a6e..6968b55fc1b 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -247,8 +247,8 @@ class GeometryNodesEvaluator {
 
   Vector<GMutablePointer> execute()
   {
-    ID *original_id = DEG_get_original_id(&(ID &)btree_);
-    BKE_nodetree_error_messages_clear((bNodeTree *)original_id);
+    bNodeTree *original_ntree = (bNodeTree *)DEG_get_original_id(&(ID &)btree_);
+    BKE_nodetree_error_messages_clear(original_ntree);
 
     Vector<GMutablePointer> results;
     for (const DInputSocket *group_output : group_outputs_) {