[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51936] trunk/blender/source/blender/ windowmanager/intern/wm_draw.c: Bugfix #33096

Ton Roosendaal ton at blender.org
Tue Nov 6 11:35:05 CET 2012


Revision: 51936
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51936
Author:   ton
Date:     2012-11-06 10:35:02 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
Bugfix #33096

Code drawing paint cursors in regions didn't check for zero-sized regions well.
Causing error prints: wmSubWindowScissorSet 0: doesn't exist

Harmless, but nicer to handle it correct :)

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_draw.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_draw.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_draw.c	2012-11-06 10:18:42 UTC (rev 51935)
+++ trunk/blender/source/blender/windowmanager/intern/wm_draw.c	2012-11-06 10:35:02 UTC (rev 51936)
@@ -84,7 +84,7 @@
 		bScreen *screen = win->screen;
 		wmPaintCursor *pc;
 
-		if (screen->subwinactive == ar->swinid) {
+		if (ar->swinid && screen->subwinactive == ar->swinid) {
 			for (pc = wm->paintcursors.first; pc; pc = pc->next) {
 				if (pc->poll == NULL || pc->poll(C)) {
 					ARegion *ar_other = CTX_wm_region(C);
@@ -631,7 +631,7 @@
 	if (paintcursor && wm->paintcursors.first) {
 		for (sa = screen->areabase.first; sa; sa = sa->next) {
 			for (ar = sa->regionbase.first; ar; ar = ar->next) {
-				if (ar->swinid == screen->subwinactive) {
+				if (ar->swinid && ar->swinid == screen->subwinactive) {
 					CTX_wm_area_set(C, sa);
 					CTX_wm_region_set(C, ar);
 




More information about the Bf-blender-cvs mailing list