[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14330] trunk/blender/source/blender/src/ drawscript.c: fix own bug with scripts drawing, could crash when a script failed

Campbell Barton ideasman42 at gmail.com
Fri Apr 4 18:32:38 CEST 2008


Revision: 14330
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14330
Author:   campbellbarton
Date:     2008-04-04 18:32:13 +0200 (Fri, 04 Apr 2008)

Log Message:
-----------
fix own bug with scripts drawing, could crash when a script failed

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawscript.c

Modified: trunk/blender/source/blender/src/drawscript.c
===================================================================
--- trunk/blender/source/blender/src/drawscript.c	2008-04-04 16:11:27 UTC (rev 14329)
+++ trunk/blender/source/blender/src/drawscript.c	2008-04-04 16:32:13 UTC (rev 14330)
@@ -108,14 +108,16 @@
 		}
 	}
 	
-	if (script->py_draw) {
-		BPY_spacescript_do_pywin_draw(sc);
+	if (script) {
+		if (script->py_draw) {
+			BPY_spacescript_do_pywin_draw(sc);
+		} else if (!script->flags && !script->py_event && !script->py_button) {
+			/* quick hack for 2.37a for scripts that call the progress bar inside a
+			 * file selector callback, to show previous space after finishing, w/o
+			 * needing an event */
+			addqueue(curarea->win, MOUSEX, 0);
+		}
 	}
-	/* quick hack for 2.37a for scripts that call the progress bar inside a
-	 * file selector callback, to show previous space after finishing, w/o
-	 * needing an event */
-	else if (!script->flags && !script->py_event && !script->py_button)
-		addqueue(curarea->win, MOUSEX, 0); 
 }
 
 void winqreadscriptspace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt)





More information about the Bf-blender-cvs mailing list