own warnings added last commit
authorCampbell Barton <ideasman42@gmail.com>
Wed, 7 Oct 2009 05:26:13 +0000 (05:26 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 7 Oct 2009 05:26:13 +0000 (05:26 +0000)
source/blender/makesrna/intern/rna_material.c

index efcf4de062e2c2ed65f465d44990a203df45ca6e..9ad421744131bfebf93177d55b50b9ac47e98279 100644 (file)
@@ -59,6 +59,7 @@ static EnumPropertyItem prop_texture_coordinates_items[] = {
 #include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_texture.h"
+#include "BKE_node.h"
 
 #include "ED_node.h"
 
@@ -176,7 +177,7 @@ static void rna_Material_active_node_material_set(PointerRNA *ptr, PointerRNA va
        Material *ma= (Material*)ptr->data;
        Material *ma_act= value.data;
 
-       nodeSetActiveID(ma->nodetree, ID_MA, ma_act);
+       nodeSetActiveID(ma->nodetree, ID_MA, &ma_act->id);
 }
 
 static void rna_MaterialStrand_start_size_range(PointerRNA *ptr, float *min, float *max)