[Bf-blender-cvs] [0c87d9b8f70] temp-nodes-group-declarations: Merge branch 'master' into temp-nodes-group-declarations

[Hans Goudey]

Commit: 0c87d9b8f70ebf4a5606503e840506ab888e1f80
Author: Hans Goudey
Date:   Tue Dec 27 12:04:36 2022 -0500
Branches: temp-nodes-group-declarations
https://developer.blender.org/rB0c87d9b8f70ebf4a5606503e840506ab888e1f80

Merge branch 'master' into temp-nodes-group-declarations

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



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

diff --cc source/blender/nodes/NOD_socket_declarations.hh
index 131aed32afa,f3a9ba25ca1..993e30b4fbd
--- a/source/blender/nodes/NOD_socket_declarations.hh
+++ b/source/blender/nodes/NOD_socket_declarations.hh
@@@ -15,15 -15,13 +15,14 @@@ class FloatBuilder
  
  class Float : public SocketDeclaration {
   public:
-   float default_value_ = 0.0f;
-   float soft_min_value_ = -FLT_MAX;
-   float soft_max_value_ = FLT_MAX;
-   PropertySubType subtype_ = PROP_NONE;
+   float default_value = 0.0f;
+   float soft_min_value = -FLT_MAX;
+   float soft_max_value = FLT_MAX;
+   PropertySubType subtype = PROP_NONE;
  
 + private:
    friend FloatBuilder;
  
-  public:
    using Builder = FloatBuilder;
  
    bNodeSocket &build(bNodeTree &ntree, bNode &node) const override;
@@@ -44,15 -42,13 +43,14 @@@ class IntBuilder
  
  class Int : public SocketDeclaration {
   public:
-   int default_value_ = 0;
-   int soft_min_value_ = INT32_MIN;
-   int soft_max_value_ = INT32_MAX;
-   PropertySubType subtype_ = PROP_NONE;
+   int default_value = 0;
+   int soft_min_value = INT32_MIN;
+   int soft_max_value = INT32_MAX;
+   PropertySubType subtype = PROP_NONE;
  
 + private:
    friend IntBuilder;
  
-  public:
    using Builder = IntBuilder;
  
    bNodeSocket &build(bNodeTree &ntree, bNode &node) const override;
@@@ -73,15 -69,13 +71,14 @@@ class VectorBuilder
  
  class Vector : public SocketDeclaration {
   public:
-   float3 default_value_ = {0, 0, 0};
-   float soft_min_value_ = -FLT_MAX;
-   float soft_max_value_ = FLT_MAX;
-   PropertySubType subtype_ = PROP_NONE;
+   float3 default_value = {0, 0, 0};
+   float soft_min_value = -FLT_MAX;
+   float soft_max_value = FLT_MAX;
+   PropertySubType subtype = PROP_NONE;
  
 + private:
    friend VectorBuilder;
  
-  public:
    using Builder = VectorBuilder;
  
    bNodeSocket &build(bNodeTree &ntree, bNode &node) const override;
@@@ -125,12 -116,10 +119,11 @@@ class ColorBuilder
  
  class Color : public SocketDeclaration {
   public:
-   ColorGeometry4f default_value_;
+   ColorGeometry4f default_value;
  
 + private:
    friend ColorBuilder;
  
-  public:
    using Builder = ColorBuilder;
  
    bNodeSocket &build(bNodeTree &ntree, bNode &node) const override;
@@@ -147,12 -136,10 +140,11 @@@ class StringBuilder
  
  class String : public SocketDeclaration {
   public:
-   std::string default_value_;
+   std::string default_value;
  
 + private:
    friend StringBuilder;
  
-  public:
    using Builder = StringBuilder;
  
    bNodeSocket &build(bNodeTree &ntree, bNode &node) const override;