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

[Jacques Lucke]

Commit: a5b9323fd50e506d9c6ab57118b9944c064f51d8
Author: Jacques Lucke
Date:   Wed Sep 15 16:18:20 2021 +0200
Branches: temp-field-visualization
https://developer.blender.org/rBa5b9323fd50e506d9c6ab57118b9944c064f51d8

Merge branch 'master' into temp-field-visualization

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



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

diff --cc source/blender/nodes/NOD_socket_declarations.hh
index d550c3e3723,3d0cfdb5d5d..d51c46847ef
--- a/source/blender/nodes/NOD_socket_declarations.hh
+++ b/source/blender/nodes/NOD_socket_declarations.hh
@@@ -145,20 -168,11 +168,17 @@@ class BoolBuilder
  class Bool : public SocketDeclaration {
   private:
    bool default_value_ = false;
+   friend BoolBuilder;
  
   public:
-   Bool &default_value(const bool value)
-   {
-     default_value_ = value;
-     return *this;
-   }
+   using Builder = BoolBuilder;
  
 +  Bool &is_field(bool value)
 +  {
 +    is_field_ = value;
 +    return *this;
 +  }
 +
    bNodeSocket &build(bNodeTree &ntree, bNode &node, eNodeSocketInOut in_out) const override;
    bool matches(const bNodeSocket &socket) const override;
  };