Commit: 818a0cdc7687c42bde76d372bfed0c6c15c153f9
Author: Antony Riakiotakis
Date: Wed Apr 22 12:03:06 2015 +0200
Branches: master
https://developer.blender.org/rB818a0cdc7687c42bde76d372bfed0c6c15c153f9
Fix stamp missing after multiview merge.
Was not using acquired render result correctly, most likely a copy paste
error.
===================================================================
M source/blender/render/intern/source/pipeline.c
===================================================================
diff --git a/source/blender/render/intern/source/pipeline.c
b/source/blender/render/intern/source/pipeline.c
index 73f837e..a1fbe7c 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2484,7 +2484,7 @@ static void renderresult_stampinfo(Render *re)
for (rv = re->result->views.first;rv;rv = rv->next, nr++) {
RE_SetActiveRenderView(re, rv->name);
RE_AcquireResultImage(re, &rres, nr);
- BKE_image_stamp_buf(re->scene, RE_GetCamera(re), (unsigned char
*)rv->rect32, rv->rectf, rres.rectx, rres.recty, 4);
+ BKE_image_stamp_buf(re->scene, RE_GetCamera(re), (unsigned char
*)rres.rect32, rres.rectf, rres.rectx, rres.recty, 4);
RE_ReleaseResultImage(re);
}
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
