diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-07 09:40:12 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-07 09:40:12 +0400 |
| commit | bac64b39e91f9da10f2b79db8fafecaf9c45a4e7 (patch) | |
| tree | 58e40312855dfaf9d367ec6e23a9e1faed968426 /source/blender/editors/sculpt_paint/paint_image.c | |
| parent | c64336390569a344f972ce41d8a1fb96d3c9c38f (diff) | |
| parent | 9161d3ce4bdd7c838751462b47eb045ea33a686e (diff) | |
Merging r39948 through r39988 from trunk into vgroup_modifiers.vgroup_modifiers
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 9539706468f..79a3251cdf1 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -4664,7 +4664,7 @@ static void paint_brush_init_tex(Brush *brush) if(brush) { MTex *mtex= &brush->mtex; if(mtex->tex && mtex->tex->nodetree) - ntreeTexBeginExecTree(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 */ } } @@ -4806,7 +4806,7 @@ static void paint_brush_exit_tex(Brush *brush) if(brush) { MTex *mtex= &brush->mtex; if(mtex->tex && mtex->tex->nodetree) - ntreeTexEndExecTree(mtex->tex->nodetree->execdata); + ntreeTexEndExecTree(mtex->tex->nodetree->execdata, 1); } } |