ok, apparently didn't commit this either. apparently includes a merge with trunk/2.5 at r24811 I thought I'd committed but did not, yeek.

5 files changed, 8 insertions, 7 deletions

diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 294e1966711..40f697c7776 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -48,10 +48,10 @@ IF(WITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(APPLE)
-	IF((CMAKE_OSX_ARCHITECTURES MATCHES "i386") OR (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64"))
+	IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
 		SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
 		SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
-	ENDIF((CMAKE_OSX_ARCHITECTURES MATCHES "i386") OR (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64"))
+	ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
 ENDIF(APPLE)
 
 #TODO
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 9c4c83a82f9..b357a17e244 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2463,7 +2463,7 @@ static void do_render_seq(Render * re)
 		if (recurs_depth == 0) { /* with nested scenes, only free on toplevel... */
 			Editing * ed = re->scene->ed;
 			if (ed) {
-				free_imbuf_seq(&ed->seqbase, TRUE);
+				free_imbuf_seq(re->scene, &ed->seqbase, TRUE);
 			}
 		}
 	}
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 74c16e349ea..fd87fd11a7b 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -190,7 +190,6 @@ static void pointdensity_cache_object(Render *re, PointDensity *pd, Object *ob)
 	int i;
 	DerivedMesh *dm;
 	MVert *mvert = NULL;
-	float cam_mat[4][4];
 	
 	dm = mesh_create_derived_render(re->scene, ob,	CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL);
 	mvert= dm->getVertArray(dm);	/* local object space */
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index d2e36a7a286..a9f6e7a53fd 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1611,17 +1611,17 @@ static void texco_mapping(ShadeInput* shi, Tex* tex, MTex* mtex, float* co, floa
 				dxt[0] = mtex->size[0]*dx[mtex->projx - 1];
 				dyt[0] = mtex->size[0]*dy[mtex->projx - 1];
 			}
-			else dxt[0] = 0.f;
+			else dxt[0] = dyt[0] = 0.f;
 			if (mtex->projy) {
 				dxt[1] = mtex->size[1]*dx[mtex->projy - 1];
 				dyt[1] = mtex->size[1]*dy[mtex->projy - 1];
 			}
-			else dxt[1] = 0.f;
+			else dxt[1] = dyt[1] = 0.f;
 			if (mtex->projz) {
 				dxt[2] = mtex->size[2]*dx[mtex->projz - 1];
 				dyt[2] = mtex->size[2]*dy[mtex->projz - 1];
 			}
-			else dxt[2]= 0.f;
+			else dxt[2]= dyt[2] = 0.f;
 		}
 	}
 }
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index 4ec30721274..e9162b7367f 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -175,6 +175,7 @@ static void lightcache_filter(VolumePrecache *vp)
 	}
 }
 
+#if 0
 static void lightcache_filter2(VolumePrecache *vp)
 {
 	int x, y, z;
@@ -211,6 +212,7 @@ static void lightcache_filter2(VolumePrecache *vp)
 	if (new_g) { MEM_freeN(new_g); new_g=NULL; }
 	if (new_b) { MEM_freeN(new_b); new_b=NULL; }
 }
+#endif
 
 static inline int ms_I(int x, int y, int z, int *n) //has a pad of 1 voxel surrounding the core for boundary simulation
 {