Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix screen layout thumbnails (T51078)

Browse Source 
GPU_framebuffer no longer handles transform matrices, which this code was relying on. Made screen_preview_draw responsible for its own ModelView matrix.
This commit is contained in:
Mike Erwin
2017-03-30 03:01:50 -04:00
parent 126ee42a30
commit 10b27bd30a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/screen/screen_draw.c
View File

@@ -433,16 +433,17 @@ static void screen_preview_draw_areas(const bScreen *screen, const float scale[2
{ {
const float ofs_h = ofs_between_areas * 0.5f; const float ofs_h = ofs_between_areas * 0.5f;
unsigned int pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 2, KEEP_FLOAT); unsigned int pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 2, KEEP_FLOAT);
rctf rect;
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformColor4fv(col); immUniformColor4fv(col);
for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
rect.xmin = sa->totrct.xmin * scale[0] + ofs_h; rctf rect = {
rect.xmax = sa->totrct.xmax * scale[0] - ofs_h; .xmin = sa->totrct.xmin * scale[0] + ofs_h,
rect.ymin = sa->totrct.ymin * scale[1] + ofs_h; .xmax = sa->totrct.xmax * scale[0] - ofs_h,
rect.ymax = sa->totrct.ymax * scale[1] - ofs_h; .ymin = sa->totrct.ymin * scale[1] + ofs_h,
.ymax = sa->totrct.ymax * scale[1] - ofs_h
};
immBegin(PRIM_TRIANGLE_FAN, 4); immBegin(PRIM_TRIANGLE_FAN, 4);
immVertex2f(pos, rect.xmin, rect.ymin); immVertex2f(pos, rect.xmin, rect.ymin);
@@ -464,10 +465,13 @@ static void screen_preview_draw(const bScreen *screen, int size_x, int size_y)
wmOrtho2(0.0f, size_x, 0.0f, size_y); wmOrtho2(0.0f, size_x, 0.0f, size_y);
/* center */ /* center */
gpuPushMatrix();
gpuTranslate2f(size_x * (1.0f - asp[0]) * 0.5f, size_y * (1.0f - asp[1]) * 0.5f); gpuTranslate2f(size_x * (1.0f - asp[0]) * 0.5f, size_y * (1.0f - asp[1]) * 0.5f);
screen_preview_scale_get(screen, size_x, size_y, asp, scale); screen_preview_scale_get(screen, size_x, size_y, asp, scale);
screen_preview_draw_areas(screen, scale, col, 1.5f); screen_preview_draw_areas(screen, scale, col, 1.5f);
gpuPopMatrix();
} }
/** /**