[Bf-blender-cvs] [5215ab0] master: Code cleanup, unneeded variable, always true when used, not used when set

Antony Riakiotakis noreply at git.blender.org
Tue Jul 22 11:57:13 CEST 2014


Commit: 5215ab0acf45a474eda4140a5d0d5bc5000b4b07
Author: Antony Riakiotakis
Date:   Tue Jul 22 11:57:03 2014 +0200
Branches: master
https://developer.blender.org/rB5215ab0acf45a474eda4140a5d0d5bc5000b4b07

Code cleanup, unneeded variable, always true when used, not used when
set

===================================================================

M	source/blender/windowmanager/intern/wm_draw.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index 96824ec..2f20e8c 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -592,7 +592,7 @@ static void wm_method_draw_triple(bContext *C, wmWindow *win)
 	bScreen *screen = win->screen;
 	ScrArea *sa;
 	ARegion *ar;
-	int copytex = 0, paintcursor = 1;
+	int copytex = 0;
 
 	if (win->drawdata) {
 		glClearColor(0, 0, 0, 0);
@@ -639,7 +639,7 @@ static void wm_method_draw_triple(bContext *C, wmWindow *win)
 		wm_triple_copy_textures(win, triple);
 	}
 
-	if (paintcursor && wm->paintcursors.first) {
+	if (wm->paintcursors.first) {
 		for (sa = screen->areabase.first; sa; sa = sa->next) {
 			for (ar = sa->regionbase.first; ar; ar = ar->next) {
 				if (ar->swinid && ar->swinid == screen->subwinactive) {
@@ -685,8 +685,6 @@ static void wm_method_draw_triple(bContext *C, wmWindow *win)
 			CTX_wm_menu_set(C, ar);
 			ED_region_do_draw(C, ar);
 			CTX_wm_menu_set(C, NULL);
-			/* when a menu is being drawn, don't do the paint cursors */
-			paintcursor = 0;
 		}
 	}




More information about the Bf-blender-cvs mailing list