diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-21 22:29:37 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-21 22:29:37 +0400 |
| commit | b8445173c4c8588a64870e93dd781d181d31c78b (patch) | |
| tree | a94a5ab2198690f6ef16231627b77b0b8a337dec /source/blender/editors/preview | |
| parent | a1407ff34215e5a72de2988e06c54379a1843c14 (diff) | |
2.5:
* Fix armature drawing crash with materials.
* Mixed texture/material preview was doing wrong gamma correction.
* Use *f math functions for AAO.
Diffstat (limited to 'source/blender/editors/preview')
| -rw-r--r-- | source/blender/editors/preview/previewrender.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/preview/previewrender.c b/source/blender/editors/preview/previewrender.c index 624952b48f5..b542b362ae0 100644 --- a/source/blender/editors/preview/previewrender.c +++ b/source/blender/editors/preview/previewrender.c @@ -472,9 +472,12 @@ void ED_preview_draw(const bContext *C, void *idp, void *parentp, rcti *rect) newrect.ymin= rect->ymin; newrect.ymax= rect->ymin; - ok= ed_preview_draw_rect(sa, sce, id, (parent != NULL), 1, rect, &newrect); - if(parent) - ok &= ed_preview_draw_rect(sa, sce, parent, 1, 0, rect, &newrect); + 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); + } + else + ok = ed_preview_draw_rect(sa, sce, id, 0, 0, rect, &newrect); if(ok) *rect= newrect; |