[Bf-blender-cvs] [50df35e4a4f] temp-field-visualization: fix after merge

Jacques Lucke noreply at git.blender.org
Mon Sep 20 18:15:42 CEST 2021


Commit: 50df35e4a4fccc76efe9c6038ff4626f94bd20ba
Author: Jacques Lucke
Date:   Fri Sep 17 13:37:21 2021 +0200
Branches: temp-field-visualization
https://developer.blender.org/rB50df35e4a4fccc76efe9c6038ff4626f94bd20ba

fix after merge

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

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

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

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 388543f280b..c140bbc49e4 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -3959,9 +3959,6 @@ NodeDeclarationHandle *nodeDeclarationEnsure(bNodeTree *UNUSED(ntree), bNode *no
   if (node->declaration != nullptr) {
     return node->declaration;
   }
-  if (node->declaration != nullptr) {
-    return;
-  }
 
   node->declaration = new blender::nodes::NodeDeclaration();
   blender::nodes::NodeDeclarationBuilder builder{*node->declaration};



More information about the Bf-blender-cvs mailing list