[Bf-blender-cvs] [99779cc] multiview: From (original) review: NODE_UPDATE_RNA > NODE_UPDATE_OPERATOR

[Dalai Felinto]

Commit: 99779ccb6fb80d3dfe2e084f47d91908860d4c35
Author: Dalai Felinto
Date:   Mon Mar 16 15:10:09 2015 +0100
Branches: multiview
https://developer.blender.org/rB99779ccb6fb80d3dfe2e084f47d91908860d4c35

>From (original) review: NODE_UPDATE_RNA > NODE_UPDATE_OPERATOR

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

M	source/blender/editors/space_node/node_edit.c
M	source/blender/makesdna/DNA_node_types.h
M	source/blender/nodes/composite/nodes/node_composite_switchview.c

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

diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index e662080..aba0742 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -1695,9 +1695,8 @@ static int node_switch_view_exec(bContext *C, wmOperator *UNUSED(op))
 	for (node = snode->edittree->nodes.first; node; node = next) {
 		next = node->next;
 		if (node->flag & SELECT) {
-
 			/* call the update function from the Switch View node */
-			node->update = NODE_UPDATE_RNA;
+			node->update = NODE_UPDATE_OPERATOR;
 		}
 	}
 
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 47770d9..10787f1 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -264,7 +264,7 @@ typedef struct bNode {
  */
 #define NODE_UPDATE			0xFFFF	/* generic update flag (includes all others) */
 #define NODE_UPDATE_ID		1		/* associated id data block has changed */
-#define NODE_UPDATE_RNA		2		/* node update triggered from update operator */
+#define NODE_UPDATE_OPERATOR		2		/* node update triggered from update operator */
 
 /* Unique hash key for identifying node instances
  * Defined as a struct because DNA does not support other typedefs.
diff --git a/source/blender/nodes/composite/nodes/node_composite_switchview.c b/source/blender/nodes/composite/nodes/node_composite_switchview.c
index f4bc632..d09d40a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_switchview.c
+++ b/source/blender/nodes/composite/nodes/node_composite_switchview.c
@@ -63,7 +63,7 @@ static void cmp_node_switch_view_update(bNodeTree *ntree, bNode *node)
 	Scene *scene = (Scene *)node->id;
 
 	/* only update when called from the operator button */
-	if (node->update != NODE_UPDATE_RNA)
+	if (node->update != NODE_UPDATE_OPERATOR)
 		return;
 
 	if (scene == NULL) {