← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/render/intern/source/pipeline.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/render/intern/source/pipeline.c
1803
1803
        return 1;
1804
1804
}
1805
1805
 
 
1806
static int node_tree_has_composite_output(bNodeTree *ntree)
 
1807
{
 
1808
        bNode *node;
 
1809
 
 
1810
        for (node = ntree->nodes.first; node; node = node->next) {
 
1811
                if (node->type == CMP_NODE_COMPOSITE) {
 
1812
                        return TRUE;
 
1813
                }
 
1814
                else if (node->type == NODE_GROUP) {
 
1815
                        if (node_tree_has_composite_output((bNodeTree *)node->id))
 
1816
                                return TRUE;
 
1817
                }
 
1818
        }
 
1819
 
 
1820
        return FALSE;
 
1821
}
 
1822
 
 
1823
static int check_composite_output(Scene *scene)
 
1824
{
 
1825
        return node_tree_has_composite_output(scene->nodetree);
 
1826
}
 
1827
 
1806
1828
int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *reports)
1807
1829
{
1808
1830
        SceneRenderLayer *srl;
1837
1859
        
1838
1860
        if (scene->r.scemode & R_DOCOMP) {
1839
1861
                if (scene->use_nodes) {
1840
 
                        bNodeTree *ntree= scene->nodetree;
1841
 
                        bNode *node;
1842
 
                
1843
 
                        if (ntree==NULL) {
 
1862
                        if (!scene->nodetree) {
1844
1863
                                BKE_report(reports, RPT_ERROR, "No Nodetree in Scene");
1845
1864
                                return 0;
1846
1865
                        }
1847
1866
                        
1848
 
                        for (node= ntree->nodes.first; node; node= node->next)
1849
 
                                if (node->type==CMP_NODE_COMPOSITE)
1850
 
                                        break;
1851
 
                        
1852
 
                        if (node==NULL) {
 
1867
                        if (!check_composite_output(scene)) {
1853
1868
                                BKE_report(reports, RPT_ERROR, "No Render Output Node in Scene");
1854
1869
                                return 0;
1855
1870
                        }