[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54470] trunk/blender/source/blender/ editors/physics/dynamicpaint_ops.c: fix [#34169] dynamic paint bake from python + command line = segfault

Campbell Barton ideasman42 at gmail.com
Mon Feb 11 16:48:43 CET 2013


Revision: 54470
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54470
Author:   campbellbarton
Date:     2013-02-11 15:48:43 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
fix [#34169] dynamic paint bake from python + command line = segfault

Modified Paths:
--------------
    trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c

Modified: trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c	2013-02-11 15:43:09 UTC (rev 54469)
+++ trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c	2013-02-11 15:48:43 UTC (rev 54470)
@@ -304,7 +304,9 @@
 		if (blender_test_break()) return 0;
 
 		/* Update progress bar cursor */
-		WM_cursor_time(win, (int)progress);
+		if (!G.background) {
+			WM_cursor_time(win, (int)progress);
+		}
 
 		/* calculate a frame */
 		scene->r.cfra = (int)frame;
@@ -346,6 +348,7 @@
  */
 static int dynamicPaint_initBake(struct bContext *C, struct wmOperator *op)
 {
+	wmWindow *win = CTX_wm_window(C);
 	DynamicPaintModifierData *pmd = NULL;
 	DynamicPaintCanvasSettings *canvas;
 	Object *ob = ED_object_context(C);
@@ -379,7 +382,9 @@
 	status = dynamicPaint_bakeImageSequence(C, surface, ob);
 	/* Clear bake */
 	canvas->flags &= ~MOD_DPAINT_BAKING;
-	WM_cursor_restore(CTX_wm_window(C));
+	if (!G.background) {
+		WM_cursor_restore(win);
+	}
 	dynamicPaint_freeSurfaceData(surface);
 
 	/* Bake was successful:




More information about the Bf-blender-cvs mailing list