workaround for crash when notifiers cause a scene update at the same time rendering starts.

happens when changing frame and pressing render quickly on a slow scene.

for now ignore animation updates while rendering.

1 files changed, 9 insertions, 2 deletions

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 15852941ca6..70e804758b2 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -234,8 +234,15 @@ void wm_event_do_notifiers(bContext *C)
 			}
 		}
 		if(do_anim) {
-			/* depsgraph gets called, might send more notifiers */
-			ED_update_for_newframe(C, 1);
+
+			/* XXX, quick frame changes can cause a crash if framechange and rendering
+			 * collide (happens on slow scenes), scene_update_for_newframe can be called
+			 * twice which can depgraph update the same object at once */
+			if(!G.rendering) {
+
+				/* depsgraph gets called, might send more notifiers */
+				ED_update_for_newframe(C, 1);
+			}
 		}
 	}