[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46689] trunk/blender/source/blender/ makesrna/intern/rna_nodetree.c: Fix #31369 ( discussed in bug report comments).

[Lukas Toenne]

Revision: 46689
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46689
Author:   lukastoenne
Date:     2012-05-16 10:10:42 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Fix #31369 (discussed in bug report comments). Setting the path/layer name 
strings of the file/layer slots of the file output node would crash, due to 
missing id.data pointer in the PointerRNA. Solved by using the 
iter->parent.id.data pointer for the RNA collection iterator.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-05-16 
09:49:16 UTC (rev 46688)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-05-16 
10:10:42 UTC (rev 46689)
@@ -833,7 +833,7 @@
 {
        PointerRNA ptr;
        bNodeSocket *sock = rna_iterator_listbase_get(iter);
-       RNA_pointer_create(iter->ptr.id.data, &RNA_NodeOutputFileSlotFile, 
sock->storage, &ptr);
+       RNA_pointer_create(iter->parent.id.data, &RNA_NodeOutputFileSlotFile, 
sock->storage, &ptr);
        return ptr;
 }
 
@@ -841,7 +841,7 @@
 {
        PointerRNA ptr;
        bNodeSocket *sock = rna_iterator_listbase_get(iter);
-       RNA_pointer_create(iter->ptr.id.data, &RNA_NodeOutputFileSlotLayer, 
sock->storage, &ptr);
+       RNA_pointer_create(iter->parent.id.data, &RNA_NodeOutputFileSlotLayer, 
sock->storage, &ptr);
        return ptr;
 }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs