[Bf-blender-cvs] [fced09c6a51] 2d: cleanup
Johnny Matthews
noreply at git.blender.org
Wed Feb 2 19:04:57 CET 2022
Commit: fced09c6a515806fc1575e853e77a4943cc063a8
Author: Johnny Matthews
Date: Wed Feb 2 11:08:36 2022 -0600
Branches: 2d
https://developer.blender.org/rBfced09c6a515806fc1575e853e77a4943cc063a8
cleanup
===================================================================
M source/blender/blenkernel/intern/node.cc
M source/blender/makesdna/DNA_node_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 41cd4ac8155..35b044adb9f 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -1774,19 +1774,8 @@ const char *nodeStaticSocketType(int type, int subtype)
}
case SOCK_VECTOR_2D:
switch (subtype) {
- // case PROP_TRANSLATION:
- // return "NodeSocketVectorTranslation";
- // case PROP_DIRECTION:
- // return "NodeSocketVectorDirection";
- // case PROP_VELOCITY:
- // return "NodeSocketVectorVelocity";
- // case PROP_ACCELERATION:
- // return "NodeSocketVectorAcceleration";
- // case PROP_EULER:
- // return "NodeSocketVectorEuler";
case PROP_XYZ:
return "NodeSocketVectorXYZ";
- // case PROP_NONE:
default:
return "NodeSocketVector2D";
}
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 4b89015a384..10b89d955cc 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -416,7 +416,7 @@ typedef struct bNode {
#define __NODE_ACTIVE_PREVIEW (1 << 18) /* deprecated */
/* node->update */
-#define NODE_UPDATE_ID 1 /* associated id data block has changed */
+#define NODE_UPDATE_ID 1 /* associated id data block has changed */
#define NODE_UPDATE_OPERATOR 2 /* node update triggered from update operator */
/* Unique hash key for identifying node instances
@@ -462,10 +462,10 @@ typedef struct bNodeLink {
/* link->flag */
#define NODE_LINKFLAG_HILITE (1 << 0) /* link has been successfully validated */
#define NODE_LINK_VALID (1 << 1)
-#define NODE_LINK_TEST (1 << 2) /* free test flag, undefined */
+#define NODE_LINK_TEST (1 << 2) /* free test flag, undefined */
#define NODE_LINK_TEMP_HIGHLIGHT (1 << 3) /* Link is highlighted for picking. */
-#define NODE_LINK_MUTED (1 << 4) /* Link is muted. */
-#define NODE_LINK_DRAGGED (1 << 5) /* Node link is being dragged by the user. */
+#define NODE_LINK_MUTED (1 << 4) /* Link is muted. */
+#define NODE_LINK_DRAGGED (1 << 5) /* Node link is being dragged by the user. */
/* tree->edit_quality/tree->render_quality */
#define NTREE_QUALITY_HIGH 0
@@ -594,7 +594,7 @@ typedef struct bNodeTree {
/** #NodeTree.type, index */
#define NTREE_UNDEFINED -2 /* Represents #NodeTreeTypeUndefined type. */
-#define NTREE_CUSTOM -1 /* for dynamically registered custom types */
+#define NTREE_CUSTOM -1 /* for dynamically registered custom types */
#define NTREE_SHADER 0
#define NTREE_COMPOSIT 1
#define NTREE_TEXTURE 2
@@ -604,11 +604,11 @@ typedef struct bNodeTree {
#define NTREE_TYPE_INIT 1
/** #NodeTree.flag */
-#define NTREE_DS_EXPAND (1 << 0) /* for animation editors */
-#define NTREE_COM_OPENCL (1 << 1) /* use opencl */
-#define NTREE_TWO_PASS (1 << 2) /* two pass */
+#define NTREE_DS_EXPAND (1 << 0) /* for animation editors */
+#define NTREE_COM_OPENCL (1 << 1) /* use opencl */
+#define NTREE_TWO_PASS (1 << 2) /* two pass */
#define NTREE_COM_GROUPNODE_BUFFER (1 << 3) /* use groupnode buffers */
-#define NTREE_VIEWER_BORDER (1 << 4) /* use a border for viewer nodes */
+#define NTREE_VIEWER_BORDER (1 << 4) /* use a border for viewer nodes */
/* NOTE: DEPRECATED, use (id->tag & LIB_TAG_LOCALIZED) instead. */
/* tree is localized copy, free when deleting node groups */
@@ -1677,7 +1677,7 @@ typedef struct NodeFunctionCompare {
/* Frame node flags. */
-#define NODE_FRAME_SHRINK 1 /* keep the bounding box minimal */
+#define NODE_FRAME_SHRINK 1 /* keep the bounding box minimal */
#define NODE_FRAME_RESIZEABLE 2 /* test flag, if frame can be resized by user */
/* Proxy node flags. */
More information about the Bf-blender-cvs
mailing list