[Bf-blender-cvs] [f17f665] multiview: From review: SwitchViewNode - use BLI_findstringindex
Dalai Felinto
noreply at git.blender.org
Tue Nov 25 18:56:49 CET 2014
Commit: f17f665e0cc56ec9e69b6d1b6b54a21cbb441471
Author: Dalai Felinto
Date: Tue Nov 25 11:35:39 2014 -0200
Branches: multiview
https://developer.blender.org/rBf17f665e0cc56ec9e69b6d1b6b54a21cbb441471
>From review: SwitchViewNode - use BLI_findstringindex
===================================================================
M source/blender/compositor/nodes/COM_SwitchViewNode.cpp
===================================================================
diff --git a/source/blender/compositor/nodes/COM_SwitchViewNode.cpp b/source/blender/compositor/nodes/COM_SwitchViewNode.cpp
index c8e6648e..36bb9f1 100644
--- a/source/blender/compositor/nodes/COM_SwitchViewNode.cpp
+++ b/source/blender/compositor/nodes/COM_SwitchViewNode.cpp
@@ -20,6 +20,7 @@
*/
#include "COM_SwitchViewNode.h"
+#include "BLI_listbase.h"
SwitchViewNode::SwitchViewNode(bNode *editorNode) : Node(editorNode)
{
@@ -30,18 +31,11 @@ void SwitchViewNode::convertToOperations(NodeConverter &converter, const Composi
{
NodeOperationOutput *result;
const char *viewName = context.getViewName();
-
- bNodeSocket *sock;
bNode *bnode = this->getbNode();
/* get the internal index of the socket with a matching name */
- int nr = 0;
- for (sock = (bNodeSocket *)bnode->inputs.first; sock; sock = sock->next, nr++) {
- if (strcmp(sock->name, viewName) == 0)
- break;
- }
-
- if (!sock) nr --;
+ int nr = BLI_findstringindex(&bnode->inputs, viewName, offsetof(bNodeSocket, name));
+ nr = max(nr, 0);
result = converter.addInputProxy(getInputSocket(nr), false);
converter.mapOutputSocket(getOutputSocket(0), result);
More information about the Bf-blender-cvs
mailing list