Revision: 32496
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32496
Author: lukastoenne
Date: 2010-10-15 12:47:22 +0200 (Fri, 15 Oct 2010)
Log Message:
-----------
Data node rna sockets restore their PropertyRNA pointers using the ui name,
should be the identifier string instead.
Modified Paths:
--------------
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h
2010-10-15 10:25:43 UTC (rev 32495)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h
2010-10-15 10:47:22 UTC (rev 32496)
@@ -192,8 +192,6 @@
bNodeTreeTypeInfo *ntreeGetTypeInfo(int type);
-//void ntreeVerifyTypes(struct bNodeTree *ntree);
-
struct bNodeTree *ntreeAddTree(int type);
void ntreeInitTypes(struct bNodeTree *ntree);
void ntreeVerifyTypes(struct bNodeTree *ntree);
Modified: branches/particles-2010/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/particles-2010/source/blender/blenloader/intern/readfile.c
2010-10-15 10:25:43 UTC (rev 32495)
+++ branches/particles-2010/source/blender/blenloader/intern/readfile.c
2010-10-15 10:47:22 UTC (rev 32496)
@@ -2104,7 +2104,7 @@
lb =
RNA_struct_defined_properties(rna_data->type);
for (link=lb->first; link; link = link->next) {
prop = (PropertyRNA *)link;
- if (strcmp(RNA_property_ui_name(prop),
sockprop->save_prop)==0) {
+ if
(strcmp(RNA_property_identifier(prop), sockprop->save_prop)==0) {
sockprop->prop = prop;
break;
}
Modified: branches/particles-2010/source/blender/makesdna/DNA_node_types.h
===================================================================
--- branches/particles-2010/source/blender/makesdna/DNA_node_types.h
2010-10-15 10:25:43 UTC (rev 32495)
+++ branches/particles-2010/source/blender/makesdna/DNA_node_types.h
2010-10-15 10:47:22 UTC (rev 32496)
@@ -102,6 +102,7 @@
/* internal data to retrieve relations and groups */
int own_index, to_index; /* group socket identifiers, to find
matching pairs after reading files */
+ /* TODO contexttype is deprecated, remove */
struct StructRNA *contexttype; /* data context type (simulation nodes)
*/
const char *contexttype_name; /* temporary name
string, only used during save/load! */
int island; /* used during island
calculation, for finding shared socket groups */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
