[Bf-blender-cvs] [b337cc1] master: Do not allocate an XRay buffer if compositing is dnot one for offscreen rendering.

Antony Riakiotakis noreply at git.blender.org
Tue Feb 17 23:38:43 CET 2015


Commit: b337cc1c21cf9e77f25dd47baea1d2fa4b7d368d
Author: Antony Riakiotakis
Date:   Tue Feb 17 23:38:28 2015 +0100
Branches: master
https://developer.blender.org/rBb337cc1c21cf9e77f25dd47baea1d2fa4b7d368d

Do not allocate an XRay buffer if compositing is dnot one for offscreen
rendering.

===================================================================

M	source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 00a67dc..0878f2b 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3133,7 +3133,7 @@ void ED_view3d_draw_offscreen(
 	}
 
 	/* main drawing call */
-	view3d_draw_objects(NULL, scene, v3d, ar, NULL, do_bgpic, true, fx);
+	view3d_draw_objects(NULL, scene, v3d, ar, NULL, do_bgpic, true, do_compositing ? fx : NULL);
 
 	/* post process */
 	if (do_compositing) {




More information about the Bf-blender-cvs mailing list