[Bf-blender-cvs] [290fe64] alembic_pointcache: Take the global G.is_break flag into account for stopping the point cache export job.

Lukas Tönne noreply at git.blender.org
Thu Oct 16 16:53:09 CEST 2014


Commit: 290fe64048b03b4674d2294731ec2f19d7859af8
Author: Lukas Tönne
Date:   Mon Nov 25 16:24:30 2013 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB290fe64048b03b4674d2294731ec2f19d7859af8

Take the global G.is_break flag into account for stopping the point
cache export job.

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

M	source/blender/editors/physics/physics_pointcache.c
M	source/blender/pointcache/intern/export.cpp

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

diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c
index 0b0f938..3d807fb 100644
--- a/source/blender/editors/physics/physics_pointcache.c
+++ b/source/blender/editors/physics/physics_pointcache.c
@@ -444,6 +444,8 @@ static void ptcache_export_startjob(void *customdata, short *stop, short *do_upd
 	data->origframelen = scene->r.framelen;
 	scene->r.framelen = 1.0f;
 	
+	G.is_break = FALSE;
+	
 	/* XXX where to get this from? */
 	start_frame = scene->r.sfra;
 	end_frame = scene->r.efra;
diff --git a/source/blender/pointcache/intern/export.cpp b/source/blender/pointcache/intern/export.cpp
index ea4d5bb..f21294d 100644
--- a/source/blender/pointcache/intern/export.cpp
+++ b/source/blender/pointcache/intern/export.cpp
@@ -22,6 +22,7 @@
 extern "C" {
 #include "DNA_scene_types.h"
 
+#include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_scene.h"
 }
@@ -58,7 +59,10 @@ void Exporter::bake(Writer *writer, int start_frame, int end_frame)
 
 bool Exporter::stop() const
 {
-	return (bool)(*m_stop);
+	if (*m_stop)
+		return true;
+	
+	return (G.is_break);
 }
 
 void Exporter::set_progress(float progress)




More information about the Bf-blender-cvs mailing list