[Bf-blender-cvs] [2c63f93] bake-cycles: Cycles-Bake: free memory after done baking
Dalai Felinto
noreply at git.blender.org
Wed Apr 23 02:47:05 CEST 2014
Commit: 2c63f937ff5d481dcfc3b5c1c78f413b423257eb
Author: Dalai Felinto
Date: Fri Feb 7 10:44:46 2014 -0200
https://developer.blender.org/rB2c63f937ff5d481dcfc3b5c1c78f413b423257eb
Cycles-Bake: free memory after done baking
I think this will fix a lot of the bugs I have now.
I left this code out originally because it was crashing things.
===================================================================
M intern/cycles/blender/blender_session.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 3a8379c..3f7eab4 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -564,7 +564,14 @@ void BlenderSession::bake(BL::Object b_object, const string& pass_type, BL::Bake
scene->bake(shader_type, bake_data, result);
- return;
+ /* free all memory used (host and device), so we wouldn't leave render
+ * engine with extra memory allocated
+ */
+
+ session->device_free();
+
+ delete sync;
+ sync = NULL;
}
void BlenderSession::do_write_update_render_result(BL::RenderResult b_rr, BL::RenderLayer b_rlay, RenderTile& rtile, bool do_update_only)
More information about the Bf-blender-cvs
mailing list