[Bf-blender-cvs] [503114993f5] temp-geometry-nodes-expandable-geometry-socket-prototype: quiet warnings

Jacques Lucke noreply at git.blender.org
Wed Aug 4 17:10:48 CEST 2021


Commit: 503114993f5e269dfff951f6a1c68b95795d4d6f
Author: Jacques Lucke
Date:   Wed Aug 4 12:40:20 2021 +0200
Branches: temp-geometry-nodes-expandable-geometry-socket-prototype
https://developer.blender.org/rB503114993f5e269dfff951f6a1c68b95795d4d6f

quiet warnings

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

M	source/blender/editors/space_node/node_edit.cc
M	source/blender/nodes/geometry/nodes/node_geo_geometry_expander.cc

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

diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index ac291b7bb83..f8fb06af010 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -2986,7 +2986,7 @@ static const EnumPropertyItem *node_geometry_expander_output_add_items(bContext
                                                                        PropertyRNA *UNUSED(prop),
                                                                        bool *r_free)
 {
-  EnumPropertyItem *items = NULL;
+  EnumPropertyItem *items = nullptr;
   int totitem = 0;
   EnumPropertyItem item = {0};
   item.identifier = "HELLO";
diff --git a/source/blender/nodes/geometry/nodes/node_geo_geometry_expander.cc b/source/blender/nodes/geometry/nodes/node_geo_geometry_expander.cc
index 16d4c0bef0f..39b97654961 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_geometry_expander.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_geometry_expander.cc
@@ -38,8 +38,11 @@ static void geo_node_geometry_expander_layout(uiLayout *layout,
   uiItemO(layout, "Add", ICON_ADD, "node.geometry_expander_output_add");
 }
 
-static bool geo_node_geometry_expande_socket_layout(
-    const bContext *C, uiLayout *layout, bNodeTree *ntree, bNode *node, bNodeSocket *socket)
+static bool geo_node_geometry_expande_socket_layout(const bContext *UNUSED(C),
+                                                    uiLayout *layout,
+                                                    bNodeTree *ntree,
+                                                    bNode *node,
+                                                    bNodeSocket *socket)
 {
   if (socket->in_out == SOCK_IN) {
     return false;



More information about the Bf-blender-cvs mailing list