[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56047] trunk/blender/source/blender/ editors/render/render_preview.c: Fix for r55961 which revered texture icons fix at r55499

[Sergey Sharybin]

Revision: 56047
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56047
Author:   nazgul
Date:     2013-04-14 14:54:08 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
Fix for r55961 which revered texture icons fix at r55499

Reported by Antony Riakiotakis, thanks!

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55961
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55499

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-04-14 13:44:04 UTC (rev 56046)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2013-04-14 14:54:08 UTC (rev 56047)
@@ -1044,10 +1044,19 @@
 		sp->pr_rect = cur_size->rect;
 		sp->id = ip->id;
 
-		if (use_new_shading)
-			sp->pr_main = G_pr_main_cycles;
-		else
+		if (use_new_shading) {
+			/* texture icon rendering is hardcoded to use BI,
+			 * so don't even think of using cycle's bmain for
+			 * texture icons
+			 */
+			if (GS(ip->id->name) != ID_TE)
+				sp->pr_main = G_pr_main_cycles;
+			else
+				sp->pr_main = G_pr_main;
+		}
+		else {
 			sp->pr_main = G_pr_main;
+		}
 
 		common_preview_startjob(sp, stop, do_update, progress);
 		shader_preview_free(sp);