diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-20 14:17:39 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-08-20 14:17:39 +0400 |
| commit | 77fb06f630c7067dbb94f704c5218f5240efd9e7 (patch) | |
| tree | c219de9d7e706c6a8787b22d78aaa8b0a4e19149 /source/blender | |
| parent | 0db0b14a525cde12bbac80c4a2c664b28b95e165 (diff) | |
Fix #23350: flip "both" texture preview order from material-texture to
texture-material so it corresponds better to the text below.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 2b579ef8af3..71bee8c5b08 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -548,8 +548,8 @@ void ED_preview_draw(const bContext *C, void *idp, void *parentp, void *slotp, r newrect.ymax= rect->ymin; if(parent) { - ok = ed_preview_draw_rect(sa, sce, parent, 1, 1, rect, &newrect); - ok &= ed_preview_draw_rect(sa, sce, id, 1, 0, rect, &newrect); + ok = ed_preview_draw_rect(sa, sce, id, 1, 1, rect, &newrect); + ok &= ed_preview_draw_rect(sa, sce, parent, 1, 0, rect, &newrect); } else ok = ed_preview_draw_rect(sa, sce, id, 0, 0, rect, &newrect); @@ -999,8 +999,8 @@ static void shader_preview_startjob(void *customdata, short *stop, short *do_upd sp->do_update= do_update; if(sp->parent) { - shader_preview_render(sp, sp->parent, 1, 1); - shader_preview_render(sp, sp->id, 1, 0); + shader_preview_render(sp, sp->id, 1, 1); + shader_preview_render(sp, sp->parent, 1, 0); } else shader_preview_render(sp, sp->id, 0, 0); |