← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-05-12 20:02:22 UTC
  • mfrom: (14.2.16 sid)
  • Revision ID: package-import@ubuntu.com-20120512200222-lznjs2cxzaq96wua
Tags: 2.63a-1
* New upstream bugfix release
  + debian/patches/: re-worked since source code changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/nodes/shader/nodes/node_shader_common.c
73
73
        bNodeTree *ngroup= (bNodeTree*)node->id;
74
74
        bNodeTreeExec *exec;
75
75
        
 
76
        if (!ngroup)
 
77
                return NULL;
 
78
        
76
79
        /* initialize the internal node tree execution */
77
80
        exec = ntreeShaderBeginExecTree(ngroup, 0);
78
81
        
121
124
        bNodeTreeExec *exec= (bNodeTreeExec*)nodedata;
122
125
        bNodeThreadStack *nts;
123
126
        
 
127
        if (!exec)
 
128
                return;
 
129
        
124
130
        /* XXX same behavior as trunk: all nodes inside group are executed.
125
131
         * it's stupid, but just makes it work. compo redesign will do this better.
126
132
         */