[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44334] branches/tile/source/blender: TileBranch

[Jeroen Bakker]

Revision: 44334
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44334
Author:   jbakker
Date:     2012-02-22 16:26:24 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
TileBranch
 * added parameter to the compositor to really identify if the
compositor is called from an editor or from the renderer/pipeline

This is a fix so that the quality level and speedups are managed
appropriate.

 - At Mind -

Modified Paths:
--------------
    branches/tile/source/blender/blenkernel/BKE_node.h
    branches/tile/source/blender/editors/space_image/image_ops.c
    branches/tile/source/blender/editors/space_node/node_edit.c
    branches/tile/source/blender/nodes/composite/node_composite_tree.c
    branches/tile/source/blender/render/intern/source/pipeline.c

Modified: branches/tile/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/tile/source/blender/blenkernel/BKE_node.h	2012-02-22 16:21:17 UTC (rev 44333)
+++ branches/tile/source/blender/blenkernel/BKE_node.h	2012-02-22 16:26:24 UTC (rev 44334)
@@ -698,7 +698,7 @@
 struct CompBuf;
 struct bNodeTreeExec *ntreeCompositBeginExecTree(struct bNodeTree *ntree, int use_tree_data);
 void ntreeCompositEndExecTree(struct bNodeTreeExec *exec, int use_tree_data);
-void ntreeCompositExecTree(struct bNodeTree *ntree, struct RenderData *rd, int do_previews);
+void ntreeCompositExecTree(struct bNodeTree *ntree, struct RenderData *rd, int rendering, int do_previews);
 void ntreeCompositTagRender(struct Scene *sce);
 int ntreeCompositTagAnimated(struct bNodeTree *ntree);
 void ntreeCompositTagGenerators(struct bNodeTree *ntree);

Modified: branches/tile/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/tile/source/blender/editors/space_image/image_ops.c	2012-02-22 16:21:17 UTC (rev 44333)
+++ branches/tile/source/blender/editors/space_image/image_ops.c	2012-02-22 16:26:24 UTC (rev 44334)
@@ -2138,7 +2138,7 @@
 	
 	BKE_image_all_free_anim_ibufs(scene->r.cfra);
 	ntreeCompositTagAnimated(scene->nodetree);
-	ntreeCompositExecTree(scene->nodetree, &scene->r, scene->r.cfra != rcd->old_cfra);	/* 1 is no previews */
+	ntreeCompositExecTree(scene->nodetree, &scene->r, 0, scene->r.cfra != rcd->old_cfra);	/* 1 is no previews */
 
 	ED_area_tag_redraw(CTX_wm_area(C));
 	

Modified: branches/tile/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/tile/source/blender/editors/space_node/node_edit.c	2012-02-22 16:21:17 UTC (rev 44333)
+++ branches/tile/source/blender/editors/space_node/node_edit.c	2012-02-22 16:26:24 UTC (rev 44334)
@@ -185,7 +185,7 @@
 	
 	// XXX BIF_store_spare();
 	
-	ntreeCompositExecTree(ntree, &cj->scene->r, 1);	/* 1 is do_previews */
+	ntreeCompositExecTree(ntree, &cj->scene->r, 0, 1);	/* 1 is do_previews */
 	
 	ntree->test_break= NULL;
 	ntree->stats_draw= NULL;

Modified: branches/tile/source/blender/nodes/composite/node_composite_tree.c
===================================================================
--- branches/tile/source/blender/nodes/composite/node_composite_tree.c	2012-02-22 16:21:17 UTC (rev 44333)
+++ branches/tile/source/blender/nodes/composite/node_composite_tree.c	2012-02-22 16:26:24 UTC (rev 44334)
@@ -555,9 +555,9 @@
 }
 
 /* optimized tree execute test for compositing */
-void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int do_preview)
+void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int rendering, int do_preview)
 {
-	COM_execute(ntree, !do_preview);
+	COM_execute(ntree, rendering);
 }
 
 /* *********************************************** */

Modified: branches/tile/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/tile/source/blender/render/intern/source/pipeline.c	2012-02-22 16:21:17 UTC (rev 44333)
+++ branches/tile/source/blender/render/intern/source/pipeline.c	2012-02-22 16:26:24 UTC (rev 44334)
@@ -1418,7 +1418,7 @@
 			ntreeCompositTagRender(re->scene);
 			ntreeCompositTagAnimated(ntree);
 			
-			ntreeCompositExecTree(ntree, &re->r, G.background==0);
+			ntreeCompositExecTree(ntree, &re->r, 1, G.background==0);
 		}
 		
 		/* ensure we get either composited result or the active layer */
@@ -1582,7 +1582,7 @@
 				if(re->r.scemode & R_FULL_SAMPLE) 
 					do_merge_fullsample(re, ntree);
 				else {
-					ntreeCompositExecTree(ntree, &re->r, G.background==0);
+					ntreeCompositExecTree(ntree, &re->r, 1, G.background==0);
 				}
 				
 				ntree->stats_draw= NULL;