[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54236] trunk/blender/source/blender/ editors/render/render_preview.c: Cycles: disable unnecessary preview render job for per node previews, they don't

[Brecht Van Lommel]

Revision: 54236
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54236
Author:   blendix
Date:     2013-01-31 15:31:47 +0000 (Thu, 31 Jan 2013)
Log Message:
-----------
Cycles: disable unnecessary preview render job for per node previews, they don't
work so was just wasting CPU time.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2013-01-31 15:08:37 UTC (rev 54235)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2013-01-31 15:31:47 UTC (rev 54236)
@@ -1100,6 +1100,10 @@
 	ShaderPreview *sp;
 	Scene *scene = CTX_data_scene(C);
 
+	/* node previews not supported for cycles */
+	if (BKE_scene_use_new_shading_nodes(scene) && method == PR_NODE_RENDER)
+		return;
+
 	wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), owner, "Shader Preview",
 	                    WM_JOB_EXCL_RENDER, WM_JOB_TYPE_RENDER_PREVIEW);
 	sp = MEM_callocN(sizeof(ShaderPreview), "shader preview");