[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60849] branches/soc-2013-depsgraph_mt/ source/blender/render/intern: Make evaluatio ncontext a part of render strcture

[Sergey Sharybin]

Revision: 60849
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60849
Author:   nazgul
Date:     2013-10-18 22:15:09 +0000 (Fri, 18 Oct 2013)
Log Message:
-----------
Make evaluatio ncontext a part of render strcture

That's how it's supposed to be actually.

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/include/render_types.h
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/convertblender.c
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/pipeline.c

Modified: branches/soc-2013-depsgraph_mt/source/blender/render/intern/include/render_types.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/render/intern/include/render_types.h	2013-10-18 20:11:07 UTC (rev 60848)
+++ branches/soc-2013-depsgraph_mt/source/blender/render/intern/include/render_types.h	2013-10-18 22:15:09 UTC (rev 60849)
@@ -52,6 +52,7 @@
 
 #include "BLI_sys_types.h" // for intptr_t support
 
+struct EvaluationContext;
 struct Object;
 struct MemArena;
 struct VertTableNode;
@@ -270,6 +271,7 @@
 	struct ReportList *reports;
 
 	struct ImagePool *pool;
+	struct EvaluationContext *evaluation_context;
 };
 
 /* ------------------------------------------------------------------------- */

Modified: branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/convertblender.c	2013-10-18 20:11:07 UTC (rev 60848)
+++ branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/convertblender.c	2013-10-18 22:15:09 UTC (rev 60849)
@@ -5234,14 +5234,11 @@
 			if ((ob->transflag & OB_DUPLI) && (ob->type!=OB_MBALL)) {
 				DupliObject *dob;
 				ListBase *lb;
-				/* TODO(sergey): Movie it to re->revaluaiton_context.  */
-				EvaluationContext evaluation_context;
-				evaluation_context.for_render = true;
 
 				/* create list of duplis generated by this object, particle
 				 * system need to have render settings set for dupli particles */
 				dupli_render_particle_set(re, ob, timeoffset, 0, 1);
-				lb= object_duplilist(&evaluation_context, re->scene, ob);
+				lb= object_duplilist(re->evaluation_context, re->scene, ob);
 				dupli_render_particle_set(re, ob, timeoffset, 0, 0);
 
 				for (dob= lb->first; dob; dob= dob->next) {

Modified: branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/pipeline.c	2013-10-18 20:11:07 UTC (rev 60848)
+++ branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/pipeline.c	2013-10-18 22:15:09 UTC (rev 60849)
@@ -373,6 +373,7 @@
 		BLI_addtail(&RenderGlobal.renderlist, re);
 		BLI_strncpy(re->name, name, RE_MAXNAME);
 		BLI_rw_mutex_init(&re->resultmutex);
+		re->evaluation_context = MEM_callocN(sizeof(EvaluationContext), "re->evaluation_context");
 	}
 	
 	RE_InitRenderCB(re);
@@ -420,6 +421,7 @@
 	render_result_free(re->pushedresult);
 	
 	BLI_remlink(&RenderGlobal.renderlist, re);
+	MEM_freeN(re->evaluation_context);
 	MEM_freeN(re);
 }
 
@@ -1311,10 +1313,7 @@
 	
 	/* make sure motion blur changes get reset to current frame */
 	if ((re->r.scemode & (R_NO_FRAME_UPDATE|R_BUTS_PREVIEW|R_VIEWPORT_PREVIEW))==0) {
-		/* TODO(sergey): Move it to re->evaluation_context. */
-		EvaluationContext evaluation_context;
-		evaluation_context.for_render = true;
-		BKE_scene_update_for_newframe(&evaluation_context, re->main, re->scene, re->lay);
+		BKE_scene_update_for_newframe(re->evaluation_context, re->main, re->scene, re->lay);
 	}
 	
 	/* weak... the display callback wants an active renderlayer pointer... */