[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49193] trunk/blender/source/blender/nodes /composite/nodes/node_composite_outputFile.c: Fix #32178, Adding " File Output" node crashes when a video output type is selected.

[Lukas Toenne]

Revision: 49193
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49193
Author:   lukastoenne
Date:     2012-07-25 10:25:53 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
Fix #32178, Adding "File Output" node crashes when a video output type is 
selected.

The image format for the node and sockets were not properly initialized. The 
file output node only supports image types (not movies), so it needs to check 
for proper format type after copying from the render settings.

Modified Paths:
--------------
    
trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c

Modified: 
trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
===================================================================
--- 
trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c  
    2012-07-25 10:15:24 UTC (rev 49192)
+++ 
trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c  
    2012-07-25 10:25:53 UTC (rev 49193)
@@ -123,6 +123,8 @@
                        sockdata->format.imtype= R_IMF_IMTYPE_OPENEXR;
                }
        }
+       else
+               BKE_imformat_defaults(&sockdata->format);
        /* use node data format by default */
        sockdata->use_node_format = TRUE;
        
@@ -174,9 +176,14 @@
                RenderData *rd = &ntemp->scene->r;
                BLI_strncpy(nimf->base_path, rd->pic, sizeof(nimf->base_path));
                nimf->format = rd->im_format;
+               if (BKE_imtype_is_movie(nimf->format.imtype)) {
+                       nimf->format.imtype= R_IMF_IMTYPE_OPENEXR;
+               }
                
-               format = &rd->im_format;
+               format = &nimf->format;
        }
+       else
+               BKE_imformat_defaults(&nimf->format);
        
        /* add one socket by default */
        ntreeCompositOutputFileAddSocket(ntree, node, "Image", format);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs