Revision: 32502
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32502
Author: lukastoenne
Date: 2010-10-15 15:24:33 +0200 (Fri, 15 Oct 2010)
Log Message:
-----------
small fixes:
- setting new StructRNA data type in SetData _after_ checking if property
sockets are still valid
- python API set_context_pointer was changed to context_pointer_set
Modified Paths:
--------------
branches/particles-2010/release/scripts/ui/properties_data_particleset.py
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_set_data.c
Modified:
branches/particles-2010/release/scripts/ui/properties_data_particleset.py
===================================================================
--- branches/particles-2010/release/scripts/ui/properties_data_particleset.py
2010-10-15 13:09:38 UTC (rev 32501)
+++ branches/particles-2010/release/scripts/ui/properties_data_particleset.py
2010-10-15 13:24:33 UTC (rev 32502)
@@ -70,7 +70,7 @@
for pp in pset.particle_properties:
box = layout.box()
- box.set_context_pointer("parprop", pp)
+ box.context_pointer_set("parprop", pp)
row = box.row()
row.prop(pp, "name")
Modified:
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_set_data.c
===================================================================
---
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_set_data.c
2010-10-15 13:09:38 UTC (rev 32501)
+++
branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_set_data.c
2010-10-15 13:24:33 UTC (rev 32502)
@@ -60,9 +60,6 @@
if (type == data->type)
return;
- /* TODO check type validity */
- data->type = type;
-
if (!RNA_struct_is_a(type, data->type)) {
/* remove property sockets */
sock=node->inputs.first;
@@ -74,6 +71,9 @@
sock = next;
}
}
+
+ /* TODO check type validity */
+ data->type = type;
}
int simnode_setdata_property_valid(bNode *node, PropertyRNA *prop)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
