svn merge -r39900:40000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / editors / sculpt_paint / paint_image.c
index 226c71b05733ad70f16edbea0b1a23e40c7dedef..ef0f4ace2b8ae6889ac45899ed15d112387980b2 100644 (file)
@@ -60,6 +60,7 @@
 #include "DNA_brush_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"
@@ -4663,7 +4664,7 @@ static void paint_brush_init_tex(Brush *brush)
        if(brush) {
                MTex *mtex= &brush->mtex;
                if(mtex->tex && mtex->tex->nodetree)
-                       ntreeBeginExecTree(mtex->tex->nodetree); /* has internal flag to detect it only does it once */
+                       ntreeTexBeginExecTree(mtex->tex->nodetree, 1); /* has internal flag to detect it only does it once */
        }
        
 }
@@ -4805,7 +4806,7 @@ static void paint_brush_exit_tex(Brush *brush)
        if(brush) {
                MTex *mtex= &brush->mtex;
                if(mtex->tex && mtex->tex->nodetree)
-                       ntreeEndExecTree(mtex->tex->nodetree);
+                       ntreeTexEndExecTree(mtex->tex->nodetree->execdata, 1);
        }       
 }