Merged changes in the trunk up to revision 25149.

After the merge operation, running the diff command showed that the
branch had a significant amount of differences from the trunk revision
25149.  I had no idea where these differences came from.  To resolve
them and make the branch up-to-date, I just copied the following files
from the trunk:

release/scripts/io/import_anim_bvh.py
release/scripts/io/import_scene_obj.py
release/scripts/ui/space_image.py
release/scripts/ui/space_view3d.py
source/blender/blenkernel/intern/object.c
source/blender/blenlib/BLI_math_base.h
source/blender/blenlib/intern/math_base.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/armature/armature_intern.h
source/blender/editors/armature/armature_ops.c
source/blender/editors/armature/editarmature.c
source/blender/editors/curve/curve_intern.h
source/blender/editors/curve/curve_ops.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_particle.h
source/blender/editors/mesh/editface.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/metaball/mball_edit.c
source/blender/editors/metaball/mball_intern.h
source/blender/editors/metaball/mball_ops.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_lattice.c
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_select.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/physics_intern.h
source/blender/editors/physics/physics_ops.c
source/blender/editors/sculpt_paint/paint_intern.h
source/blender/editors/sculpt_paint/paint_ops.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_operators.c

1 files changed, 20 insertions, 13 deletions

diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index d0cff4c1761..2327f4e069e 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -1,18 +1,21 @@
 #!/usr/bin/python
 Import ('env')
 
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
-	# FIXME: need to set the appropriate flags for msvc, otherwise we get warnings
-	cflags = []
-	cxxflags = []
+cflags = env['CCFLAGS']
+cxxflags = env['CXXFLAGS']
+
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+    if env['WITH_BF_RAYOPTIMIZATION']:
+        cflags = env['CCFLAGS'] + ['/arch:SSE']
+
+if env['OURPLATFORM'] == 'win32-mingw':
+    if env['WITH_BF_RAYOPTIMIZATION']:
+        cflags = env['CCFLAGS'] + ['-mfpmath=sse']
 
 if env['OURPLATFORM'] == 'darwin':
-	if env['MACOSX_ARCHITECTURE'] in ('i386', 'x86_64'):
-		cflags = env['CFLAGS'] + ['-mfpmath=sse']
-		cxxflags = env['CXXFLAGS'] + ['-mfpmath=sse']
-	else:
-		cflags = env['CFLAGS']
-		cxxflags = env['CXXFLAGS']
+    if env['MACOSX_ARCHITECTURE'] in ('i386', 'x86_64') and env['WITH_BF_RAYOPTIMIZATION']:
+        cflags = env['CFLAGS'] + ['-mfpmath=sse']
+        cxxflags = env['CXXFLAGS'] + ['-mfpmath=sse']
 
 sources = env.Glob('intern/source/*.c')
 raysources = env.Glob('intern/raytrace/*.cpp')
@@ -31,15 +34,19 @@ if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 
 if env['OURPLATFORM'] == 'linux2':
-#	SSE is NOT safe all the time on linux, plus that ignores users compile flags and therefore no no
+#    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']
+    if env['WITH_BF_RAYOPTIMIZATION']:
+        cflags = env['CCFLAGS'] +  ['-O2','-msse2','-mfpmath=sse', '-pthread']
+        cxxflags = env['CXXFLAGS'] +  ['-O2','-msse2','-mfpmath=sse', '-pthread']
     incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
+if env['WITH_BF_RAYOPTIMIZATION']:
+    defs.append('__SSE__')
+
 env.BlenderLib ( libname = 'bf_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=145, compileflags=cflags )
 env.BlenderLib ( libname = 'bf_render_raytrace', sources = raysources, includes = Split(incs), defines=defs, libtype='core', priority=145, compileflags=cflags, cxx_compileflags=cxxflags )