[Bf-blender-cvs] [6a72188b3e4] temp-field-visualization: Merge branch 'master' into temp-field-visualization

[Jacques Lucke]

Commit: 6a72188b3e4a3c56df5dc65b61449ed64ffac2d3
Author: Jacques Lucke
Date:   Fri Sep 17 13:35:54 2021 +0200
Branches: temp-field-visualization
https://developer.blender.org/rB6a72188b3e4a3c56df5dc65b61449ed64ffac2d3

Merge branch 'master' into temp-field-visualization

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



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

diff --cc source/blender/blenkernel/intern/node.cc
index c140bbc49e4,b96e98a58ec..388543f280b
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -3951,14 -3942,14 +3951,17 @@@ int nodeSocketLinkLimit(const bNodeSock
   * If the node implements a `declare` function, this function makes sure that `node->declaration`
   * is up to date.
   */
 -void nodeDeclarationEnsure(bNodeTree *UNUSED(ntree), bNode *node)
 +NodeDeclarationHandle *nodeDeclarationEnsure(bNodeTree *UNUSED(ntree), bNode *node)
  {
    if (node->typeinfo->declare == nullptr) {
 -    return;
 +    return nullptr;
 +  }
 +  if (node->declaration != nullptr) {
 +    return node->declaration;
    }
+   if (node->declaration != nullptr) {
+     return;
+   }
  
    node->declaration = new blender::nodes::NodeDeclaration();
    blender::nodes::NodeDeclarationBuilder builder{*node->declaration};