[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13656] trunk/blender/source/blender/nodes /intern/CMP_nodes/CMP_defocus.c:

[Brecht Van Lommel]

Revision: 13656
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13656
Author:   blendix
Date:     2008-02-12 16:34:26 +0100 (Tue, 12 Feb 2008)

Log Message:
-----------

Bugfix: when defocus node had nothing to do and just passed on the buffer,
it didn't correctly deal with pointers, gave a crash in some circumstances.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c	2008-02-12 15:26:20 UTC (rev 13655)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c	2008-02-12 15:34:26 UTC (rev 13656)
@@ -779,9 +779,7 @@
 	
 	// if image not valid type or fstop==infinite (128), nothing to do, pass in to out
 	if (((img->type!=CB_RGBA) && (img->type!=CB_VAL)) || ((nqd->no_zbuf==0) && (nqd->fstop==128.f))) {
-		new = alloc_compbuf(img->x, img->y, img->type, 0);
-		new->rect = img->rect;
-		out[0]->data = new;
+		out[0]->data = pass_on_compbuf(img);
 		return;
 	}