- added mesh_get_derived_render

 - cancelled previous commit to add RE_findTFAce, instead just added
   a MemArena to render struct... free'd at end of render, can be used
   to store other data as well
 - switch rendering to using DerivedMesh API... this is slightly more
   inefficient now because it is doing some unnecessary copying. Can
   be fixed by defining a DerivedMesh function to convert the object
   into a render object (on todo list)

2 files changed, 7 insertions, 13 deletions

diff --git a/source/blender/render/extern/include/render.h b/source/blender/render/extern/include/render.h
index af4ec2d38ee..77e2125d314 100644
--- a/source/blender/render/extern/include/render.h
+++ b/source/blender/render/extern/include/render.h
@@ -191,7 +191,6 @@ void ramp_spec_result(float *specr, float *specg, float *specb, ShadeInput *shi)
 struct VlakRen *RE_findOrAddVlak(int nr);
 struct VertRen *RE_findOrAddVert(int nr);
 struct HaloRen *RE_findOrAddHalo(int nr);
-struct TFace *RE_findTFace(void);
 HaloRen *RE_inithalo(struct Material *ma, float *vec, float *vec1, float *orco, float hasize, 
 					float vectsize, int seed);
 
diff --git a/source/blender/render/extern/include/render_types.h b/source/blender/render/extern/include/render_types.h
index 111662be15b..7b1aeb24009 100644
--- a/source/blender/render/extern/include/render_types.h
+++ b/source/blender/render/extern/include/render_types.h
@@ -51,17 +51,6 @@
 
 /* ------------------------------------------------------------------------- */
 
-struct TFace;
-
-typedef struct TFaceBlock TFaceBlock;
-
-struct TFaceBlock {
-	TFaceBlock *next;
-
-	struct TFace *tfaces;
-	int numAvail;
-};
-
 /* localized texture result data */
 typedef struct TexResult {
 	float tin, tr, tg, tb, ta;
@@ -111,6 +100,8 @@ typedef struct ShadeInput
 	
 } ShadeInput;
 
+struct MemArena;
+
 /* here only stuff to initalize the render itself */
 typedef struct RE_Render
 {
@@ -150,7 +141,11 @@ typedef struct RE_Render
 	struct VlakRen **blovl;
 	struct VertRen **blove;
 	struct HaloRen **bloha;
-	struct TFaceBlock *tfaceBlocks;
+
+	/* arena for allocating data for use during render, for
+	 * example dynamic TFaces to go in the VlakRen structure.
+	 */
+	struct MemArena *memArena;
 
 	int *rectaccu;
 	int *rectz; /* z buffer: distance buffer */