Sculpt:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24483:24889

3 files changed, 9 insertions, 6 deletions

diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index 795e7247597..63ef83a0cfe 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -31,8 +31,11 @@ if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 
 if env['OURPLATFORM'] == 'linux2':
-    cflags = ['-O2','-msse2','-mfpmath=sse', '-pthread']
-    cxxflags = ['-O2','-msse2','-mfpmath=sse', '-pthread']
+#	SSE is NOT safe all the time on linux, plus that ignores users compile flags and therefore no no
+#    cflags = ['-O2','-msse2','-mfpmath=sse', '-pthread']
+#    cxxflags = ['-O2','-msse2','-mfpmath=sse', '-pthread']
+    cflags = env['CCFLAGS']
+    cxxflags = env['CXXFLAGS']
     incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
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/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;
 		}
 	}
 }