[Bf-blender-cvs] [ec34afe] soc-2013-depsgraph_mt: Workaround for render settings with mballs and cycles

Sergey Sharybin noreply at git.blender.org
Wed Dec 11 11:28:35 CET 2013


Commit: ec34afe8ebebb524d9ab04c0c9d9e38277ebff63
Author: Sergey Sharybin
Date:   Tue Dec 10 18:53:40 2013 +0600
http://developer.blender.org/rBec34afe8ebebb524d9ab04c0c9d9e38277ebff63

Workaround for render settings with mballs and cycles

Not ideal solution, but it'll work just fine for until
CoW is implemented (which is gonna to take a while anyway).

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

M	source/blender/makesrna/intern/rna_main_api.c

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

diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index fde3c6a..f1e31a1 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -357,7 +357,13 @@ Mesh *rna_Main_meshes_new_from_object(
 
 			if (render) {
 				ListBase disp = {NULL, NULL};
-				BKE_displist_make_mball_forRender(bmain->evaluation_context, sce, ob, &disp);
+				/* TODO(sergey): This is gonna to work for until EvaluationContext
+				 *               only contains for_render flag. As soon as CoW is
+				 *               implemented, this is to be rethinked.
+				 */
+				EvaluationContext evaluation_context;
+				evaluation_context.for_render = render;
+				BKE_displist_make_mball_forRender(&evaluation_context, sce, ob, &disp);
 				BKE_mesh_from_metaball(&disp, tmpmesh);
 				BKE_displist_free(&disp);
 			}




More information about the Bf-blender-cvs mailing list