Commit: f89be0af55c2dbf6de5082330a4d4c150ed6d3af
Author: OmarSquircleArt
Date: Sat Aug 3 13:54:16 2019 +0200
Branches: soc-2019-cycles-procedural
https://developer.blender.org/rBf89be0af55c2dbf6de5082330a4d4c150ed6d3af
Use function instead of macro.
===================================================================
M source/blender/blenloader/intern/versioning_cycles.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_cycles.c
b/source/blender/blenloader/intern/versioning_cycles.c
index 6e538e30184..63cbda67177 100644
--- a/source/blender/blenloader/intern/versioning_cycles.c
+++ b/source/blender/blenloader/intern/versioning_cycles.c
@@ -44,7 +44,10 @@
#include "BLO_readfile.h"
#include "readfile.h"
-#define IS_SOCKET_IN_USE(sock) (sock->flag & SOCK_IN_USE)
+static bool socket_is_used(bNodeSocket *sock)
+{
+ return sock->flag & SOCK_IN_USE;
+}
static float *cycles_node_socket_float_value(bNodeSocket *socket)
{
@@ -533,7 +536,7 @@ static void
update_vector_add_and_subtract_operators(bNodeTree *ntree)
for (bNode *node = ntree->nodes.first; node; node = node->next) {
if (node->type == SH_NODE_VECTOR_MATH) {
bNodeSocket *sockOutValue = nodeFindSocket(node, SOCK_OUT, "Value");
- if (IS_SOCKET_IN_USE(sockOutValue) &&
+ if (socket_is_used(sockOutValue) &&
ELEM(node->custom1, NODE_VECTOR_MATH_ADD,
NODE_VECTOR_MATH_SUBTRACT)) {
bNode *absNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
