From d9c9209608c59cb5f93c4d781b418d868765b94c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 15 Mar 2013 22:55:10 +0000 Subject: code cleanup: quiet some -Wshadow warnings, mix of obvious mistakes and harmless global/local naming conflict. --- source/blender/windowmanager/intern/wm_subwindow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/windowmanager/intern/wm_subwindow.c') diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index 20406ac463d..01bebe8a1b8 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -257,9 +257,9 @@ void wmSubWindowScissorSet(wmWindow *win, int swinid, rcti *srct) glViewport(_curswin->winrct.xmin, _curswin->winrct.ymin, width, height); if (srct) { - int width = BLI_rcti_size_x(srct) + 1; /* only here */ - int height = BLI_rcti_size_y(srct) + 1; - glScissor(srct->xmin, srct->ymin, width, height); + int scissor_width = BLI_rcti_size_x(srct) + 1; /* only here */ + int scissor_height = BLI_rcti_size_y(srct) + 1; + glScissor(srct->xmin, srct->ymin, scissor_width, scissor_height); } else glScissor(_curswin->winrct.xmin, _curswin->winrct.ymin, width, height); -- cgit v1.2.3