[Bf-blender-cvs] [0dd0166] gooseberry: Removed deprecated code.

[Lukas Tönne]

Commit: 0dd01668b466bde0bc83b0e17aaa327a4706056a
Author: Lukas Tönne
Date:   Thu Mar 19 19:12:20 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB0dd01668b466bde0bc83b0e17aaa327a4706056a

Removed deprecated code.

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

M	source/blender/pointcache/PTC_api.cpp
M	source/blender/pointcache/intern/export.cpp
M	source/blender/pointcache/intern/export.h

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

diff --git a/source/blender/pointcache/PTC_api.cpp b/source/blender/pointcache/PTC_api.cpp
index a895ec9..647daeb 100644
--- a/source/blender/pointcache/PTC_api.cpp
+++ b/source/blender/pointcache/PTC_api.cpp
@@ -151,7 +151,6 @@ void PTC_write_sample(struct PTCWriter *_writer)
 	writer->write_sample();
 }
 
-#if 1
 void PTC_bake(struct Main *bmain, struct Scene *scene, struct EvaluationContext *evalctx,
               PTCWriter *writer, int start_frame, int end_frame,
               short *stop, short *do_update, float *progress)
@@ -159,15 +158,6 @@ void PTC_bake(struct Main *bmain, struct Scene *scene, struct EvaluationContext
 	PTC::Exporter exporter(bmain, scene, evalctx, stop, do_update, progress);
 	exporter.bake(writer, start_frame, end_frame);
 }
-#else
-void PTC_bake(struct Main *bmain, struct Scene *scene, struct EvaluationContext *evalctx,
-              struct ListBase *writers, DerivedMesh **render_dm_ptr, int start_frame, int end_frame,
-              short *stop, short *do_update, float *progress)
-{
-	PTC::Exporter exporter(bmain, scene, evalctx, stop, do_update, progress);
-	exporter.bake(writers, render_dm_ptr, start_frame, end_frame);
-}
-#endif
 
 
 void PTC_reader_free(PTCReader *_reader)
diff --git a/source/blender/pointcache/intern/export.cpp b/source/blender/pointcache/intern/export.cpp
index 01cf2ce..3736dd9 100644
--- a/source/blender/pointcache/intern/export.cpp
+++ b/source/blender/pointcache/intern/export.cpp
@@ -48,7 +48,6 @@ Exporter::Exporter(Main *bmain, Scene *scene, EvaluationContext *evalctx, short
 {
 }
 
-#if 1
 void Exporter::bake(PTCWriter *writer, int start_frame, int end_frame)
 {
 	set_progress(0.0f);
@@ -65,94 +64,6 @@ void Exporter::bake(PTCWriter *writer, int start_frame, int end_frame)
 			break;
 	}
 }
-#else
-void Exporter::set_bake_object(Object *ob, DerivedMesh **render_dm_ptr, CacheModifierData **cachemd_ptr)
-{
-	const bool use_render = (m_evalctx->mode == DAG_EVAL_RENDER);
-	const int required_mode = use_render ? eModifierMode_Render : eModifierMode_Realtime;
-	
-	if (!ob)
-		return;
-	
-	/* cache modifier can be used to store an intermediate DM stage */
-//	CacheModifierData *cachemd = (CacheModifierData *)mesh_find_cache_modifier(m_scene, ob, required_mode);
-	CacheModifierData *cachemd = NULL;
-	*cachemd_ptr = cachemd;
-	
-	/* construct the correct DM based on evaluation mode */
-	if (use_render && ob->type == OB_MESH && ob->data) {
-		/* tell the modifier to store a copy of the DM for us */
-		if (cachemd)
-			cachemd->flag |= MOD_CACHE_USE_OUTPUT_RENDER;
-		
-		/* Evaluate object for render settings
-		 * This is not done by BKE_scene_update_for_newframe!
-		 * Instead we have to construct the render DM explicitly like a render engine would do.
-		 */
-		DerivedMesh *render_dm = mesh_create_derived_render(m_scene, ob, CD_MASK_MESH);
-		*render_dm_ptr = render_dm;
-	}
-	else {
-		*render_dm_ptr = NULL;
-	}
-}
-
-void Exporter::release_bake_object(DerivedMesh **render_dm_ptr, CacheModifierData *cachemd)
-{
-	const bool use_render = (m_evalctx->mode == DAG_EVAL_RENDER);
-	
-	if (cachemd) {
-		if (use_render) {
-			cachemd->flag &= ~MOD_CACHE_USE_OUTPUT_RENDER;
-			if (cachemd->output_dm) {
-				cachemd->output_dm->release(cachemd->output_dm);
-				cachemd->output_dm = NULL;
-			}
-		}
-	}
-	if (*render_dm_ptr) {
-		(*render_dm_ptr)->release(*render_dm_ptr);
-		*render_dm_ptr = NULL;
-	}
-}
-
-void Exporter::bake(ListBase *writers, DerivedMesh **render_dm_ptr, int start_frame, int end_frame)
-{
-	set_progress(0.0f);
-	
-	for (int cfra = start_frame; cfra <= end_frame; ++cfra) {
-		m_scene->r.cfra = cfra;
-		BKE_scene_update_for_newframe(m_evalctx, m_bmain, m_scene, m_scene->lay);
-		
-		/* Writers have been sorted by their objects.
-		 * This allows us to evaluate one object at a time in order to avoid
-		 * reconstructing the same object for render settings multiple times.
-		 */
-		Object *curob = NULL;
-		CacheModifierData *cachemd = NULL;
-		for (CacheLibraryWriterLink *link = (CacheLibraryWriterLink *)writers->first; link; link = link->next) {
-			Writer *writer = (Writer *)link->writer;
-			Object *ob = link->ob;
-			
-			if (ob != curob) {
-				release_bake_object(render_dm_ptr, cachemd);
-				set_bake_object(ob, render_dm_ptr, &cachemd);
-				curob = ob;
-			}
-			
-			if (writer)
-				writer->write_sample();
-		}
-		
-		release_bake_object(render_dm_ptr, cachemd);
-		
-		set_progress((float)(cfra - start_frame + 1) / (float)(end_frame - start_frame + 1));
-		
-		if (stop())
-			break;
-	}
-}
-#endif
 
 bool Exporter::stop() const
 {
diff --git a/source/blender/pointcache/intern/export.h b/source/blender/pointcache/intern/export.h
index 31428a5..2449b3f 100644
--- a/source/blender/pointcache/intern/export.h
+++ b/source/blender/pointcache/intern/export.h
@@ -39,11 +39,7 @@ class Exporter
 public:
 	Exporter(Main *bmain, Scene *scene, EvaluationContext *evalctx, short *stop, short *do_update, float *progress);
 	
-#if 1
 	void bake(PTCWriter *writer, int start_frame, int end_frame);
-#else
-	void bake(ListBase *writers, DerivedMesh **render_dm_ptr, int start_frame, int end_frame);
-#endif
 	
 	bool stop() const;