← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/nodes/shader/node_shader_tree.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/nodes/shader/node_shader_tree.c
189
189
 
190
190
void ntreeGPUMaterialNodes(bNodeTree *ntree, GPUMaterial *mat)
191
191
{
 
192
        /* localize tree to create links for reroute and mute */
 
193
        bNodeTree *localtree = ntreeLocalize(ntree);
192
194
        bNodeTreeExec *exec;
193
195
 
194
 
        exec = ntreeShaderBeginExecTree(ntree);
195
 
 
 
196
        exec = ntreeShaderBeginExecTree(localtree);
196
197
        ntreeExecGPUNodes(exec, mat, 1);
197
 
 
198
198
        ntreeShaderEndExecTree(exec);
 
199
 
 
200
        ntreeFreeTree_ex(localtree, false);
 
201
        MEM_freeN(localtree);
199
202
}
200
203
 
201
204
/* **************** call to switch lamploop for material node ************ */