[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25914] trunk/blender/source/blender: Fix [#20000] Connect to File Output node creates segfault

[Matt Ebb]

Revision: 25914
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25914
Author:   broken
Date:     2010-01-12 03:53:15 +0100 (Tue, 12 Jan 2010)

Log Message:
-----------
Fix [#20000] Connect to File Output node creates segfault

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_edit.c
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2010-01-12 02:34:57 UTC (rev 25913)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2010-01-12 02:53:15 UTC (rev 25914)
@@ -1239,7 +1239,7 @@
 		node_set_active(snode, node);
 		
 		if(snode->nodetree->type==NTREE_COMPOSIT) {
-			if(ELEM3(node->type, CMP_NODE_R_LAYERS, CMP_NODE_COMPOSITE, CMP_NODE_DEFOCUS))
+			if(ELEM4(node->type, CMP_NODE_R_LAYERS, CMP_NODE_COMPOSITE, CMP_NODE_DEFOCUS, CMP_NODE_OUTPUT_FILE))
 				node->id = &scene->id;
 			
 			ntreeCompositForceHidden(snode->edittree, scene);

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c	2010-01-12 02:34:57 UTC (rev 25913)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c	2010-01-12 02:53:15 UTC (rev 25914)
@@ -62,7 +62,7 @@
 				}
 			}
 			
-			BKE_makepicstring(string, nif->name, rd->cfra, nif->imtype, ((Scene *)node->id)->r.scemode & R_EXTENSION);
+			BKE_makepicstring(string, nif->name, rd->cfra, nif->imtype, (rd->scemode & R_EXTENSION));
 			
 			if(0 == BKE_write_ibuf((Scene *)node->id, ibuf, string, nif->imtype, nif->subimtype, nif->imtype==R_OPENEXR?nif->codec:nif->quality))
 				printf("Cannot save Node File Output to %s\n", string);