kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for r55961 which revered texture icons fix at r55499

Browse Source 
Reported by Antony Riakiotakis, thanks!
This commit is contained in:
Sergey Sharybin 2013-04-14 14:54:08 +00:00
parent 1166609cd3
commit 04680a0340
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/render/render_preview.c
View File

@ -1044,10 +1044,19 @@ static void icon_preview_startjob_all_sizes(void *customdata, short *stop, short
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);