[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33012] branches/particles-2010/source/ blender/nodes/intern/SIM_nodes: Fixed wrong context size in "If" and "Pass" node kernels.
Lukas Toenne
lukas.toenne at googlemail.com
Thu Nov 11 15:13:58 CET 2010
Revision: 33012
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33012
Author: lukastoenne
Date: 2010-11-11 15:13:58 +0100 (Thu, 11 Nov 2010)
Log Message:
-----------
Fixed wrong context size in "If" and "Pass" node kernels.
Modified Paths:
--------------
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_if.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_math.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_pass.c
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_if.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_if.c 2010-11-11 14:01:55 UTC (rev 33011)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_if.c 2010-11-11 14:13:58 UTC (rev 33012)
@@ -211,7 +211,6 @@
/* "if" node for data sets */
static void enqueue(SimExecData *execdata, SimNodeStack *node, SimDataContext *self)
{
- SimDataContext ctx;
SimKernel *kernel;
char kernelname[64];
SimKernelFunction kernelfunc;
@@ -232,7 +231,7 @@
if (kernelfunc) {
kernel=MEM_callocN(sizeof(SimKernel), "SimKernel");
sim_kernel_init(execdata, kernel, node, kernelfunc, kernelname, 0);
- sim_kernel_enqueue(execdata, kernel, ctx.size, &node->inputevents, &node->events);
+ sim_kernel_enqueue(execdata, kernel, node->outstack[0].context.size, &node->inputevents, &node->events);
}
}
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_math.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_math.c 2010-11-11 14:01:55 UTC (rev 33011)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_math.c 2010-11-11 14:13:58 UTC (rev 33012)
@@ -899,7 +899,6 @@
static void enqueue_minimum(SimExecData *execdata, SimNodeStack *node, SimDataContext *self)
{
- SimDataContext ctx;
SimKernel *kernel;
char kernelname[64];
SimKernelFunction kernelfunc;
@@ -914,7 +913,7 @@
if (kernelfunc) {
kernel=MEM_callocN(sizeof(SimKernel), "SimKernel");
sim_kernel_init(execdata, kernel, node, kernelfunc, kernelname, 0);
- sim_kernel_enqueue(execdata, kernel, ctx.size, &node->inputevents, &node->events);
+ sim_kernel_enqueue(execdata, kernel, node->outstack[0].context.size, &node->inputevents, &node->events);
}
}
@@ -981,7 +980,6 @@
static void enqueue_maximum(SimExecData *execdata, SimNodeStack *node, SimDataContext *self)
{
- SimDataContext ctx;
SimKernel *kernel;
char kernelname[64];
SimKernelFunction kernelfunc;
@@ -996,7 +994,7 @@
if (kernelfunc) {
kernel=MEM_callocN(sizeof(SimKernel), "SimKernel");
sim_kernel_init(execdata, kernel, node, kernelfunc, kernelname, 0);
- sim_kernel_enqueue(execdata, kernel, ctx.size, &node->inputevents, &node->events);
+ sim_kernel_enqueue(execdata, kernel, node->outstack[0].context.size, &node->inputevents, &node->events);
}
}
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_pass.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_pass.c 2010-11-11 14:01:55 UTC (rev 33011)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_pass.c 2010-11-11 14:13:58 UTC (rev 33012)
@@ -153,7 +153,6 @@
/* "pass" node for data sets */
static void enqueue(SimExecData *execdata, SimNodeStack *node, SimDataContext *self)
{
- SimDataContext ctx;
SimKernel *kernel;
char kernelname[64];
SimKernelFunction kernelfunc;
@@ -174,7 +173,7 @@
if (kernelfunc) {
kernel=MEM_callocN(sizeof(SimKernel), "SimKernel");
sim_kernel_init(execdata, kernel, node, kernelfunc, kernelname, 0);
- sim_kernel_enqueue(execdata, kernel, ctx.size, &node->inputevents, &node->events);
+ sim_kernel_enqueue(execdata, kernel, node->outstack[0].context.size, &node->inputevents, &node->events);
}
}
More information about the Bf-blender-cvs
mailing list