[Bf-blender-cvs] [5cc665f] cycles-ptex-24: Temporarily turn off shader preview rendering

Nicholas Bishop noreply at git.blender.org
Fri Jan 30 18:00:45 CET 2015


Commit: 5cc665f7fd36fe06919e4f5f44e3b2c50d43153a
Author: Nicholas Bishop
Date:   Fri Jan 23 17:15:30 2015 +0100
Branches: cycles-ptex-24
https://developer.blender.org/rB5cc665f7fd36fe06919e4f5f44e3b2c50d43153a

Temporarily turn off shader preview rendering

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

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 1e30e05..c1b18cd 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3153,6 +3153,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 
 void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
 {
+	#if 0
 	Object *camera;
 	int winx, winy;
 
@@ -3175,6 +3176,7 @@ void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
 
 	BKE_image_pool_free(re->pool);
 	re->pool = NULL;
+	#endif
 }
 
 /* note; repeated win/disprect calc... solve that nicer, also in compo */




More information about the Bf-blender-cvs mailing list