[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11350] branches/2-44-stable/blender/ source/blender/render/intern/source: branches/2-44-stable

[Diego Borghetti (Plumiferos)]

Revision: 11350
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11350
Author:   bdiego
Date:     2007-07-23 16:30:05 +0200 (Mon, 23 Jul 2007)

Log Message:
-----------
branches/2-44-stable

Merge from trunk:

	revision 11349

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11349

Modified Paths:
--------------
    branches/2-44-stable/blender/source/blender/render/intern/source/pipeline.c
    branches/2-44-stable/blender/source/blender/render/intern/source/rendercore.c

Modified: branches/2-44-stable/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/2-44-stable/blender/source/blender/render/intern/source/pipeline.c	2007-07-23 14:16:41 UTC (rev 11349)
+++ branches/2-44-stable/blender/source/blender/render/intern/source/pipeline.c	2007-07-23 14:30:05 UTC (rev 11350)
@@ -576,7 +576,7 @@
 
 static int render_scene_needs_vector(Render *re)
 {
-	if(re->r.scemode & R_DOCOMP) {
+	if((re->r.scemode & R_DOCOMP) || re->r.imtype==R_MULTILAYER) {
 		SceneRenderLayer *srl;
 	
 		for(srl= re->scene->r.layers.first; srl; srl= srl->next)

Modified: branches/2-44-stable/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- branches/2-44-stable/blender/source/blender/render/intern/source/rendercore.c	2007-07-23 14:16:41 UTC (rev 11349)
+++ branches/2-44-stable/blender/source/blender/render/intern/source/rendercore.c	2007-07-23 14:30:05 UTC (rev 11350)
@@ -772,7 +772,7 @@
 	fp= RE_RenderLayerGetPass(rl, SCE_PASS_VECTOR);
 	if(fp==NULL) return;
 	
-	for(a= 4*pa->rectx*pa->recty; a>0; a--)
+	for(a= 4*pa->rectx*pa->recty - 1; a>=0; a--)
 		if(fp[a] == PASS_VECTOR_MAX) fp[a]= 0.0f;
 }