[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33338] branches/particles-2010/source/ blender/nodes/intern/SIM_util.c: Support for doubles added to data node ID property sockets.
Lukas Toenne
lukas.toenne at googlemail.com
Fri Nov 26 18:02:00 CET 2010
Revision: 33338
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33338
Author: lukastoenne
Date: 2010-11-26 18:02:00 +0100 (Fri, 26 Nov 2010)
Log Message:
-----------
Support for doubles added to data node ID property sockets. ID properties added manually (instead of making a socket on a SetData node) are created as IDP_DOUBLE. This is now converted to float sockets.
Modified Paths:
--------------
branches/particles-2010/source/blender/nodes/intern/SIM_util.c
Modified: branches/particles-2010/source/blender/nodes/intern/SIM_util.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_util.c 2010-11-26 16:48:10 UTC (rev 33337)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_util.c 2010-11-26 17:02:00 UTC (rev 33338)
@@ -1581,6 +1581,8 @@
case SOCK_FLOAT:
if (prop->type==IDP_FLOAT)
sim_output_write_float(execdata, iter, IDP_Float(prop));
+ else if (prop->type==IDP_DOUBLE)
+ sim_output_write_float(execdata, iter, (float)IDP_Double(prop));
else
sim_output_write_float(execdata, iter, 0.0f);
break;
@@ -1634,6 +1636,7 @@
void sim_idprop_socket_read(struct SimExecData *execdata, struct IDProperty *prop, struct SimSocketIterator *iter)
{
+ float valfloat;
char valbool;
char valstring[SIM_STRINGLENGTH];
@@ -1641,6 +1644,10 @@
case SOCK_FLOAT:
if (prop->type==IDP_FLOAT)
sim_input_read_float(execdata, iter, &IDP_Float(prop));
+ else if (prop->type==IDP_DOUBLE) {
+ sim_input_read_float(execdata, iter, &valfloat);
+ IDP_Double(prop) = valfloat;
+ }
break;
case SOCK_INT:
if (prop->type==IDP_INT)
More information about the Bf-blender-cvs
mailing list