← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

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

  • Committer: Reinhard Tartler
  • Date: 2014-05-31 01:50:05 UTC
  • mfrom: (14.2.27 sid)
  • Revision ID: siretart@tauware.de-20140531015005-ml6druahuj82nsav
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/nodes/shader/node_shader_util.c
219
219
        return inactivenode;
220
220
}
221
221
 
222
 
void ntreeExecGPUNodes(bNodeTreeExec *exec, GPUMaterial *mat, int do_outputs)
 
222
void ntreeExecGPUNodes(bNodeTreeExec *exec, GPUMaterial *mat, int do_outputs, short compatibility)
223
223
{
224
224
        bNodeExec *nodeexec;
225
225
        bNode *node;
238
238
                do_it = FALSE;
239
239
                /* for groups, only execute outputs for edited group */
240
240
                if (node->typeinfo->nclass == NODE_CLASS_OUTPUT) {
241
 
                        if (do_outputs && (node->flag & NODE_DO_OUTPUT))
242
 
                                do_it = TRUE;
 
241
                        if (node->typeinfo->compatibility & compatibility)
 
242
                                if (do_outputs && (node->flag & NODE_DO_OUTPUT))
 
243
                                        do_it = TRUE;
243
244
                }
244
245
                else
245
246
                        do_it = TRUE;