diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-14 18:54:08 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-14 18:54:08 +0400 |
| commit | 04680a0340f3d2fcaca375f4c2e76fd7d98992f8 (patch) | |
| tree | c6df62efa9a45e82bc77b63d04965eb572f576ef /source/blender/editors/render | |
| parent | 1166609cd36af1ab43a1f5004afaac34bcc9d94a (diff) | |
Fix for r55961 which revered texture icons fix at r55499
Reported by Antony Riakiotakis, thanks!
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index a42f15a9037..0caf4a7351f 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -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); |