diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 02:37:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 02:37:04 +0400 |
| commit | ae25aa22105b060294095357692f2aed4c650ce8 (patch) | |
| tree | 06548276f86326f21943f8ec7ef92765a97b5ab5 /source/blender/blenkernel/intern/material.c | |
| parent | 29b7b344fc48ed31b1e36818ab4767090691d6e2 (diff) | |
| parent | 03762409cd4f812d152e42de9c4f9853df91be0b (diff) | |
svn merge ^/trunk/blender -r55372:55392
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 6f6686150ae..a863d187a2c 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1015,7 +1015,7 @@ void init_render_material(Material *mat, int r_mode, float *amb) init_render_nodetree(mat->nodetree, mat, r_mode, amb); if (!mat->nodetree->execdata) - mat->nodetree->execdata = ntreeShaderBeginExecTree(mat->nodetree, 1); + mat->nodetree->execdata = ntreeShaderBeginExecTree(mat->nodetree); } } @@ -1049,7 +1049,7 @@ void end_render_material(Material *mat) { if (mat && mat->nodetree && mat->use_nodes) { if (mat->nodetree->execdata) - ntreeShaderEndExecTree(mat->nodetree->execdata, 1); + ntreeShaderEndExecTree(mat->nodetree->execdata); } } |