[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55276] trunk/blender/source/blender: Code cleanup: replace magic constant used for alpha ignore flag with a define.

[Sergey Sharybin]

Revision: 55276
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55276
Author:   nazgul
Date:     2013-03-14 10:15:10 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Code cleanup: replace magic constant used for alpha ignore flag with a define.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_CompositorNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp
    trunk/blender/source/blender/makesdna/DNA_node_types.h
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c

Modified: trunk/blender/source/blender/compositor/nodes/COM_CompositorNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_CompositorNode.cpp	2013-03-14 10:07:05 UTC (rev 55275)
+++ trunk/blender/source/blender/compositor/nodes/COM_CompositorNode.cpp	2013-03-14 10:15:10 UTC (rev 55276)
@@ -41,10 +41,11 @@
 	compositorOperation->setSceneName(editorNode->id->name);
 	compositorOperation->setRenderData(context->getRenderData());
 	compositorOperation->setbNodeTree(context->getbNodeTree());
-	compositorOperation->setIgnoreAlpha(editorNode->custom2 & 1);
+	compositorOperation->setIgnoreAlpha(editorNode->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA);
 	imageSocket->relinkConnections(compositorOperation->getInputSocket(0), 0, graph);
 	alphaSocket->relinkConnections(compositorOperation->getInputSocket(1));
 	depthSocket->relinkConnections(compositorOperation->getInputSocket(2));
 	graph->addOperation(compositorOperation);
 	addPreviewOperation(graph, context, compositorOperation->getInputSocket(0));
 }
+

Modified: trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp	2013-03-14 10:07:05 UTC (rev 55275)
+++ trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp	2013-03-14 10:15:10 UTC (rev 55276)
@@ -47,7 +47,7 @@
 	viewerOperation->setChunkOrder((OrderOfChunks)editorNode->custom1);
 	viewerOperation->setCenterX(editorNode->custom3);
 	viewerOperation->setCenterY(editorNode->custom4);
-	viewerOperation->setIgnoreAlpha(editorNode->custom2 & 1);
+	viewerOperation->setIgnoreAlpha(editorNode->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA);
 
 	viewerOperation->setViewSettings(context->getViewSettings());
 	viewerOperation->setDisplaySettings(context->getDisplaySettings());

Modified: trunk/blender/source/blender/makesdna/DNA_node_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_node_types.h	2013-03-14 10:07:05 UTC (rev 55275)
+++ trunk/blender/source/blender/makesdna/DNA_node_types.h	2013-03-14 10:15:10 UTC (rev 55276)
@@ -860,4 +860,7 @@
 /* image */
 #define CMP_NODE_IMAGE_USE_STRAIGHT_OUTPUT	1
 
+/* viewer and cmposite output */
+#define CMP_NODE_OUTPUT_IGNORE_ALPHA		1
+
 #endif

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-03-14 10:07:05 UTC (rev 55275)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-03-14 10:15:10 UTC (rev 55276)
@@ -4134,7 +4134,7 @@
 	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "use_alpha", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "custom2", 1);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "custom2", CMP_NODE_OUTPUT_IGNORE_ALPHA);
 	RNA_def_property_ui_text(prop, "Use Alpha", "Colors are treated alpha premultiplied, or colors output straight (alpha gets set to 1)");
 	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
@@ -4144,7 +4144,7 @@
 	PropertyRNA *prop;
 
 	prop = RNA_def_property(srna, "use_alpha", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "custom2", 1);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "custom2", CMP_NODE_OUTPUT_IGNORE_ALPHA);
 	RNA_def_property_ui_text(prop, "Use Alpha", "Colors are treated alpha premultiplied, or colors output straight (alpha gets set to 1)");
 	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }