Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-04-28 10:01:34 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-28 10:02:22 +0300
commit617534327ad48583b2688997f59a998824df20af (patch)
tree401302e1432e09cb61e6827b8a48d70afef78d93 /source/blender/windowmanager
parentcfa1700792a7c7d6413b0ed6e59f56c0484a911a (diff)
Cleanup: style, duplicate includes
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_draw.c16
-rw-r--r--source/blender/windowmanager/intern/wm_stereo.c4
2 files changed, 7 insertions, 13 deletions
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index 8524b629cc5..f111bc3e2d1 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -105,16 +105,10 @@ static void wm_paintcursor_draw(bContext *C, ARegion *ar)
if (ELEM(win->grabcursor, GHOST_kGrabWrap, GHOST_kGrabHide)) {
int x = 0, y = 0;
wm_get_cursor_position(win, &x, &y);
- pc->draw(C,
- x,
- y,
- pc->customdata);
+ pc->draw(C, x, y, pc->customdata);
}
else {
- pc->draw(C,
- win->eventstate->x,
- win->eventstate->y,
- pc->customdata);
+ pc->draw(C, win->eventstate->x, win->eventstate->y, pc->customdata);
}
glScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
@@ -581,7 +575,7 @@ static void wm_draw_window_onscreen(bContext *C, wmWindow *win, int view)
if (ar->visible && ar->overlap == false) {
if (view == -1 && ar->draw_buffer && ar->draw_buffer->stereo) {
/* Stereo drawing from textures. */
- if(win->stereo3d_format->display_mode == S3D_DISPLAY_ANAGLYPH) {
+ if (win->stereo3d_format->display_mode == S3D_DISPLAY_ANAGLYPH) {
wm_stereo3d_draw_anaglyph(win, ar);
}
else {
@@ -660,7 +654,7 @@ static void wm_draw_window(bContext *C, wmWindow *win)
/* Regular mono drawing. */
wm_draw_window_onscreen(C, win, -1);
}
- else if(win->stereo3d_format->display_mode == S3D_DISPLAY_PAGEFLIP) {
+ else if (win->stereo3d_format->display_mode == S3D_DISPLAY_PAGEFLIP) {
/* For pageflip we simply draw to both back buffers. */
glDrawBuffer(GL_BACK_LEFT);
wm_draw_window_onscreen(C, win, 0);
@@ -668,7 +662,7 @@ static void wm_draw_window(bContext *C, wmWindow *win)
wm_draw_window_onscreen(C, win, 1);
glDrawBuffer(GL_BACK);
}
- else if(ELEM(win->stereo3d_format->display_mode, S3D_DISPLAY_ANAGLYPH, S3D_DISPLAY_INTERLACE)) {
+ else if (ELEM(win->stereo3d_format->display_mode, S3D_DISPLAY_ANAGLYPH, S3D_DISPLAY_INTERLACE)) {
/* For anaglyph and interlace, we draw individual regions with
* stereo framebuffers using different shaders. */
wm_draw_window_onscreen(C, win, -1);
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c
index 14093d01695..4450d18a5df 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -99,8 +99,8 @@ void wm_stereo3d_draw_interlace(wmWindow *win, ARegion *ar)
}
immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_INTERLACE);
- immUniform1i("image_a", (swap)? 1: 0);
- immUniform1i("image_b", (swap)? 0: 1);
+ immUniform1i("image_a", (swap) ? 1 : 0);
+ immUniform1i("image_b", (swap) ? 0 : 1);
immUniform1i("interlace_id", interlace_gpu_id_from_type(interlace_type));