Merged changes in the trunk up to revision 54421.

Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/properties_render.py
source/blender/SConscript
source/blender/blenloader/intern/readfile.c

7 files changed, 100 insertions, 76 deletions

diff --git a/build_files/cmake/cmake_consistency_check_config.py b/build_files/cmake/cmake_consistency_check_config.py
index 6b82e224a32..55bad251a53 100644
--- a/build_files/cmake/cmake_consistency_check_config.py
+++ b/build_files/cmake/cmake_consistency_check_config.py
@@ -29,6 +29,22 @@ IGNORE = (
     "extern/recastnavigation/Recast/Source/RecastTimer.cpp",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
     "intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
+    "intern/cycles/render/film_response.cpp",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc",
+    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc",
 
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
@@ -47,6 +63,11 @@ IGNORE = (
     "extern/recastnavigation/Recast/Include/RecastTimer.h",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.h",
     "intern/audaspace/SRC/AUD_SRCResampleReader.h",
+    "intern/cycles/render/film_response.h",
+    "extern/carve/include/carve/config.h",
+    "extern/carve/include/carve/external/boost/random.hpp",
+    "extern/carve/patches/files/config.h",
+    "extern/carve/patches/files/random.hpp",
     )
 
 UTF8_CHECK = True
diff --git a/build_files/cmake/config/blender_headless.cmake b/build_files/cmake/config/blender_headless.cmake
index c4d64125744..cfde86aac6d 100644
--- a/build_files/cmake/config/blender_headless.cmake
+++ b/build_files/cmake/config/blender_headless.cmake
@@ -5,19 +5,19 @@
 #   cmake -C../blender/build_files/cmake/config/blender_headless.cmake  ../blender
 #
 
-set(WITH_HEADLESS            ON  CACHE FORCE BOOL) 
-set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
+set(WITH_HEADLESS            ON  CACHE BOOL "" FORCE) 
+set(WITH_GAMEENGINE          OFF CACHE BOOL "" FORCE)
 
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesnt hold the audio device and loads quickly.
-set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
-set(WITH_FFTW3               OFF CACHE FORCE BOOL)
-set(WITH_JACK                OFF CACHE FORCE BOOL)
-set(WITH_SDL                 OFF CACHE FORCE BOOL)
-set(WITH_OPENAL              OFF CACHE FORCE BOOL)
-set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
-set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)
+set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
+set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
+set(WITH_JACK                OFF CACHE BOOL "" FORCE)
+set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
+set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 
 # other features which are not especially useful as a python module
-set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)
-set(WITH_INPUT_NDOF          OFF CACHE FORCE BOOL)
+set(WITH_X11_XINPUT          OFF CACHE BOOL "" FORCE)
+set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake
index e74d1adcb1b..f7778ac214d 100644
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -5,47 +5,47 @@
 #   cmake -C../blender/build_files/cmake/config/blender_lite.cmake  ../blender
 #
 
-set(WITH_INSTALL_PORTABLE    ON  CACHE FORCE BOOL)
-set(WITH_SYSTEM_GLEW         ON  CACHE FORCE BOOL)
+set(WITH_INSTALL_PORTABLE    ON  CACHE BOOL "" FORCE)
+set(WITH_SYSTEM_GLEW         ON  CACHE BOOL "" FORCE)
 
-set(WITH_BUILDINFO           OFF CACHE FORCE BOOL)
-set(WITH_BULLET              OFF CACHE FORCE BOOL)
-set(WITH_CODEC_AVI           OFF CACHE FORCE BOOL)
-set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
-set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)
-set(WITH_CYCLES              OFF CACHE FORCE BOOL)
-set(WITH_FFTW3               OFF CACHE FORCE BOOL)
-set(WITH_LIBMV               OFF CACHE FORCE BOOL)
-set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
-set(WITH_COMPOSITOR          OFF CACHE FORCE BOOL)
-set(WITH_GHOST_XDND          OFF CACHE FORCE BOOL)
-set(WITH_IK_SOLVER           OFF CACHE FORCE BOOL)
-set(WITH_IK_ITASC            OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_CINEON        OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_DDS           OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_FRAMESERVER   OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_HDR           OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_OPENEXR       OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_OPENJPEG      OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_REDCODE       OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_TIFF          OFF CACHE FORCE BOOL)
-set(WITH_INPUT_NDOF          OFF CACHE FORCE BOOL)
-set(WITH_INTERNATIONAL       OFF CACHE FORCE BOOL)
-set(WITH_JACK                OFF CACHE FORCE BOOL)
-set(WITH_LZMA                OFF CACHE FORCE BOOL)
-set(WITH_LZO                 OFF CACHE FORCE BOOL)
-set(WITH_MOD_BOOLEAN         OFF CACHE FORCE BOOL)
-set(WITH_MOD_FLUID           OFF CACHE FORCE BOOL)
-set(WITH_MOD_REMESH          OFF CACHE FORCE BOOL)
-set(WITH_MOD_SMOKE           OFF CACHE FORCE BOOL)
-set(WITH_MOD_OCEANSIM        OFF CACHE FORCE BOOL)
-set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
-set(WITH_OPENAL              OFF CACHE FORCE BOOL)
-set(WITH_OPENCOLLADA         OFF CACHE FORCE BOOL)
-set(WITH_OPENCOLORIO         OFF CACHE FORCE BOOL)
-set(WITH_OPENMP              OFF CACHE FORCE BOOL)
-set(WITH_PYTHON_INSTALL      OFF CACHE FORCE BOOL)
-set(WITH_RAYOPTIMIZATION     OFF CACHE FORCE BOOL)
-set(WITH_SDL                 OFF CACHE FORCE BOOL)
-set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)
-set(WITH_X11_XF86VMODE       OFF CACHE FORCE BOOL)
+set(WITH_BUILDINFO           OFF CACHE BOOL "" FORCE)
+set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_AVI           OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
+set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
+set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
+set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
+set(WITH_GAMEENGINE          OFF CACHE BOOL "" FORCE)
+set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
+set(WITH_GHOST_XDND          OFF CACHE BOOL "" FORCE)
+set(WITH_IK_SOLVER           OFF CACHE BOOL "" FORCE)
+set(WITH_IK_ITASC            OFF CACHE BOOL "" FORCE)
+set(WITH_IMAGE_CINEON        OFF CACHE BOOL "" FORCE)
+set(WITH_IMAGE_DDS           OFF CACHE BOOL "" FORCE)
+set(WITH_IMAGE_FRAMESERVER   OFF CACHE BOOL "" FORCE)
+set(WITH_IMAGE_HDR           OFF CACHE BOOL "" FORCE)
+set(WITH_IMAGE_OPENEXR       OFF CACHE BOOL "" FORCE)
+set(WITH_IMAGE_OPENJPEG      OFF CACHE BOOL "" FORCE)
+set(WITH_IMAGE_REDCODE       OFF CACHE BOOL "" FORCE)
+set(WITH_IMAGE_TIFF          OFF CACHE BOOL "" FORCE)
+set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
+set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
+set(WITH_JACK                OFF CACHE BOOL "" FORCE)
+set(WITH_LZMA                OFF CACHE BOOL "" FORCE)
+set(WITH_LZO                 OFF CACHE BOOL "" FORCE)
+set(WITH_MOD_BOOLEAN         OFF CACHE BOOL "" FORCE)
+set(WITH_MOD_FLUID           OFF CACHE BOOL "" FORCE)
+set(WITH_MOD_REMESH          OFF CACHE BOOL "" FORCE)
+set(WITH_MOD_SMOKE           OFF CACHE BOOL "" FORCE)
+set(WITH_MOD_OCEANSIM        OFF CACHE BOOL "" FORCE)
+set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
+set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
+set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
+set(WITH_OPENCOLORIO         OFF CACHE BOOL "" FORCE)
+set(WITH_OPENMP              OFF CACHE BOOL "" FORCE)
+set(WITH_PYTHON_INSTALL      OFF CACHE BOOL "" FORCE)
+set(WITH_RAYOPTIMIZATION     OFF CACHE BOOL "" FORCE)
+set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
+set(WITH_X11_XINPUT          OFF CACHE BOOL "" FORCE)
+set(WITH_X11_XF86VMODE       OFF CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/bpy_module.cmake b/build_files/cmake/config/bpy_module.cmake
index 6279f06214f..b5b13b40987 100644
--- a/build_files/cmake/config/bpy_module.cmake
+++ b/build_files/cmake/config/bpy_module.cmake
@@ -4,30 +4,30 @@
 #   cmake -C../blender/build_files/cmake/config/bpy_module.cmake  ../blender
 #
 
-set(WITH_PYTHON_MODULE       ON  CACHE FORCE BOOL)
+set(WITH_PYTHON_MODULE       ON  CACHE BOOL "" FORCE)
 
 # install into the systems python dir
-set(WITH_INSTALL_PORTABLE    OFF CACHE FORCE BOOL)
+set(WITH_INSTALL_PORTABLE    OFF CACHE BOOL "" FORCE)
 
 # no point int copying python into python
-set(WITH_PYTHON_INSTALL      OFF CACHE FORCE BOOL)
+set(WITH_PYTHON_INSTALL      OFF CACHE BOOL "" FORCE)
 
 # dont build the game engine
-set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
+set(WITH_GAMEENGINE          OFF CACHE BOOL "" FORCE)
 
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesnt hold the audio device and loads quickly.
-set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
-set(WITH_FFTW3               OFF CACHE FORCE BOOL)
-set(WITH_JACK                OFF CACHE FORCE BOOL)
-set(WITH_SDL                 OFF CACHE FORCE BOOL)
-set(WITH_OPENAL              OFF CACHE FORCE BOOL)
-set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
-set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)
+set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
+set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
+set(WITH_JACK                OFF CACHE BOOL "" FORCE)
+set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
+set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
+set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 
 # other features which are not especially useful as a python module
-set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)
-set(WITH_INPUT_NDOF          OFF CACHE FORCE BOOL)
-set(WITH_OPENCOLLADA         OFF CACHE FORCE BOOL)
-set(WITH_INTERNATIONAL       OFF CACHE FORCE BOOL)
-set(WITH_BULLET              OFF CACHE FORCE BOOL)
+set(WITH_X11_XINPUT          OFF CACHE BOOL "" FORCE)
+set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
+set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
+set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
+set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py
index ee1b7bfa38c..f662ec4d2d1 100644
--- a/build_files/scons/config/darwin-config.py
+++ b/build_files/scons/config/darwin-config.py
@@ -137,7 +137,7 @@ else:
     BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}m'
     BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
     #BF_PYTHON_LIB = ''
-    BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config-3.2m'
+    BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config-${BF_PYTHON_VERSION}m'
 
 WITH_BF_OPENAL = True
 #different lib must be used  following version of gcc
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index 33f01616579..ef938ff3337 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -178,7 +178,7 @@ WITH_BF_STATICOCIO = True
 WITH_BF_BOOST = True
 BF_BOOST = '${LIBDIR}/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49 libboost_wave-vc90-mt-s-1_49'
 BF_BOOST_LIB_INTERNATIONAL = ' libboost_locale-vc90-mt-s-1_49'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index eac26c1a50b..cfcdecac8e7 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -29,6 +29,7 @@ from SCons.Script.SConscript import SConsEnvironment
 import SCons.Action
 import SCons.Util
 import SCons.Builder
+import SCons.Subst
 import SCons.Tool
 import bcolors
 bc = bcolors.bcolors()
@@ -234,10 +235,6 @@ def setup_staticlibs(lenv):
         if lenv['WITH_BF_STATICLLVM']:
             statlibs += Split(lenv['BF_LLVM_LIB_STATIC'])
 
-    # setting this last so any overriding of manually libs could be handled
-    if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross', 'win64-mingw'):
-        libincs.append('/usr/lib')
-
     if lenv['WITH_BF_JEMALLOC']:
         libincs += Split(lenv['BF_JEMALLOC_LIBPATH'])
         if lenv['WITH_BF_STATICJEMALLOC']:
@@ -249,6 +246,12 @@ def setup_staticlibs(lenv):
             if lenv['WITH_BF_STATIC3DMOUSE']:
                 statlibs += Split(lenv['BF_3DMOUSE_LIB_STATIC'])
 
+    # setting this last so any overriding of manually libs could be handled
+    if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross', 'win64-mingw'):
+        # We must remove any previous items defining this path, for same reason stated above!
+        libincs = [e for e in libincs if SCons.Subst.scons_subst(e, lenv, gvars=lenv.Dictionary()) != "/usr/lib"]
+        libincs.append('/usr/lib')
+
     return statlibs, libincs
 
 def setup_syslibs(lenv):