[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34353] trunk/blender/source/blender/nodes /intern/CMP_nodes/CMP_texture.c: Fix for 25655: Crashes with texture node in compositor.
Lukas Toenne
lukas.toenne at googlemail.com
Sun Jan 16 17:00:08 CET 2011
Revision: 34353
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34353
Author: lukastoenne
Date: 2011-01-16 16:00:06 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
Fix for 25655: Crashes with texture node in compositor.
Texture node was using the preview buffer instead of socket output buffers, which is already free'd at that point.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c 2011-01-16 15:02:07 UTC (rev 34352)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c 2011-01-16 16:00:06 UTC (rev 34353)
@@ -118,7 +118,7 @@
VECCOPY(stackbuf->procedural_offset, in[0]->vec);
VECCOPY(stackbuf->procedural_size, in[1]->vec);
stackbuf->procedural_type= CB_VAL;
- composit1_pixel_processor(node, prevbuf, prevbuf, out[0]->vec, do_copy_value, CB_VAL);
+ composit1_pixel_processor(node, stackbuf, stackbuf, out[0]->vec, do_copy_value, CB_VAL);
stackbuf->rect_procedural= NULL;
out[0]->data= stackbuf;
@@ -131,7 +131,7 @@
VECCOPY(stackbuf->procedural_offset, in[0]->vec);
VECCOPY(stackbuf->procedural_size, in[1]->vec);
stackbuf->procedural_type= CB_RGBA;
- composit1_pixel_processor(node, prevbuf, prevbuf, out[0]->vec, do_copy_rgba, CB_RGBA);
+ composit1_pixel_processor(node, stackbuf, stackbuf, out[0]->vec, do_copy_rgba, CB_RGBA);
stackbuf->rect_procedural= NULL;
out[1]->data= stackbuf;
More information about the Bf-blender-cvs
mailing list