[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57695] branches/soc-2013-depsgraph_mt: Merging r57629 through r57694 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jun 24 14:30:05 CEST 2013
Revision: 57695
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57695
Author: nazgul
Date: 2013-06-24 12:30:05 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
Merging r57629 through r57694 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57629
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57694
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-glibc211-i686.py
branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-glibc211-x86_64.py
branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_test.py
branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake
branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-vc-config.py
branches/soc-2013-depsgraph_mt/build_files/scons/config/win64-vc-config.py
branches/soc-2013-depsgraph_mt/build_files/scons/tools/Blender.py
branches/soc-2013-depsgraph_mt/build_files/scons/tools/btools.py
branches/soc-2013-depsgraph_mt/doc/python_api/examples/mathutils.Vector.py
branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py
branches/soc-2013-depsgraph_mt/intern/cycles/device/device_cuda.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/device/device_opencl.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel.cl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_displace.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_path.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_random.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_types.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_bump.osl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_color.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_image_texture.osl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_texture.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_wavelength.osl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_wireframe.osl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/svm/svm_wavelength.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/svm/svm_wireframe.h
branches/soc-2013-depsgraph_mt/intern/cycles/render/graph.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/graph.h
branches/soc-2013-depsgraph_mt/intern/cycles/render/light.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/nodes.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/nodes.h
branches/soc-2013-depsgraph_mt/intern/cycles/render/osl.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/util/util_types.h
branches/soc-2013-depsgraph_mt/intern/cycles/util/util_vector.h
branches/soc-2013-depsgraph_mt/intern/locale/boost_locale_wrapper.cpp
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2013-depsgraph_mt/release/scripts/templates_osl/ramp_closure.osl
branches/soc-2013-depsgraph_mt/release/scripts/templates_osl/temperature_to_rgb.osl
branches/soc-2013-depsgraph_mt/release/scripts/templates_osl/wavelength_to_rgb.osl
branches/soc-2013-depsgraph_mt/release/scripts/templates_osl/westin_closure.osl
branches/soc-2013-depsgraph_mt/source/blender/blenfont/intern/blf_lang.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_bpath.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_deform.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/armature.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/blender.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/colortools.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/deform.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_smallhash.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/smallhash.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/string.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/winstuff.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_mesh.h
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_object.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_panel.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mask/mask_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_path.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/meshtools.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_intern.h
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_info/info_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-depsgraph_mt/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-depsgraph_mt/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-depsgraph_mt/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_scene_types.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/intern/node_socket.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_wavelength.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_wireframe.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy.c
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/initrender.c
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/voxeldata.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-depsgraph_mt/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/VideoTexture/VideoFFmpeg.cpp
Added Paths:
-----------
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_connect_pair.c
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_wavelength.osl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/shaders/node_wireframe.osl
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/svm/svm_wavelength.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/svm/svm_wireframe.h
branches/soc-2013-depsgraph_mt/release/scripts/templates_osl/ramp_closure.osl
branches/soc-2013-depsgraph_mt/release/scripts/templates_osl/temperature_to_rgb.osl
branches/soc-2013-depsgraph_mt/release/scripts/templates_osl/wavelength_to_rgb.osl
branches/soc-2013-depsgraph_mt/release/scripts/templates_osl/westin_closure.osl
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_wavelength.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/nodes/node_shader_wireframe.c
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57628
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57694
Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-glibc211-i686.py 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-glibc211-i686.py 2013-06-24 12:30:05 UTC (rev 57695)
@@ -55,6 +55,8 @@
WITH_BF_FREETYPE_STATIC = False
WITH_BF_OPENEXR = True
+BF_OPENEXR = '/opt/lib/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
WITH_BF_STATICOPENEXR = True
WITH_BF_TIFF = True
Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-glibc211-x86_64.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-glibc211-x86_64.py 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-glibc211-x86_64.py 2013-06-24 12:30:05 UTC (rev 57695)
@@ -55,6 +55,8 @@
WITH_BF_FREETYPE_STATIC = False
WITH_BF_OPENEXR = True
+BF_OPENEXR = '/opt/lib/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
WITH_BF_STATICOPENEXR = True
WITH_BF_TIFF = True
Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-player-glibc211-i686.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-player-glibc211-i686.py 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-player-glibc211-i686.py 2013-06-24 12:30:05 UTC (rev 57695)
@@ -40,6 +40,8 @@
WITH_BF_FREETYPE_STATIC = False
WITH_BF_OPENEXR = True
+BF_OPENEXR = '/opt/lib/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
WITH_BF_STATICOPENEXR = True
WITH_BF_TIFF = True
Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-player-glibc211-x86_64.py 2013-06-24 12:30:05 UTC (rev 57695)
@@ -40,6 +40,8 @@
WITH_BF_FREETYPE_STATIC = False
WITH_BF_OPENEXR = True
+BF_OPENEXR = '/opt/lib/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
WITH_BF_STATICOPENEXR = True
WITH_BF_TIFF = True
Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_test.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_test.py 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_test.py 2013-06-24 12:30:05 UTC (rev 57695)
@@ -31,7 +31,7 @@
# we run from build/ directory
blender_dir = '../blender'
-if builder.find('cmake') != -1:
+if "cmake" in builder:
# cmake
retcode = subprocess.call(['ctest', '.' '--output-on-failure'])
sys.exit(retcode)
Modified: branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake 2013-06-24 12:30:05 UTC (rev 57695)
@@ -401,8 +401,14 @@
set(${_sse_flags} "-msse")
set(${_sse2_flags} "-msse2")
elseif(MSVC)
- set(${_sse_flags} "/arch:SSE")
- set(${_sse2_flags} "/arch:SSE2")
+ # x86_64 has this auto enabled
+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+ set(${_sse_flags} "")
+ set(${_sse2_flags} "")
+ else()
+ set(${_sse_flags} "/arch:SSE")
+ set(${_sse2_flags} "/arch:SSE2")
+ endif()
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
set(${_sse_flags} "") # icc defaults to -msse
set(${_sse2_flags} "-msse2")
Modified: branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-vc-config.py 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-vc-config.py 2013-06-24 12:30:05 UTC (rev 57695)
@@ -3,10 +3,9 @@
CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
CL_STDOUT, CL_STDERR = CL_OUT.communicate()
-if CL_STDERR.find("Version 15.00.") == -1:
+if "17.00." in CL_STDERR:
VC_VERSION = '11.0'
LCGDIR = '#../lib/windows_vc11'
-
else:
VC_VERSION = '9.0'
LCGDIR = '#../lib/windows'
@@ -215,8 +214,13 @@
#CUDA
WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
+# Workaround for ptxas.exe crash on VS2012 and cuda 5.5
+if VC_VERSION == '11.0':
+ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+else:
+ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
+
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
Modified: branches/soc-2013-depsgraph_mt/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/scons/config/win64-vc-config.py 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/build_files/scons/config/win64-vc-config.py 2013-06-24 12:30:05 UTC (rev 57695)
@@ -3,10 +3,9 @@
CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
CL_STDOUT, CL_STDERR = CL_OUT.communicate()
-if CL_STDERR.find("Version 15.00.") == -1:
+if "17.00." in CL_STDERR:
VC_VERSION = '11.0'
LCGDIR = '#../lib/win64_vc11'
-
else:
VC_VERSION = '9.0'
LCGDIR = '#../lib/win64'
Modified: branches/soc-2013-depsgraph_mt/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/scons/tools/Blender.py 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/build_files/scons/tools/Blender.py 2013-06-24 12:30:05 UTC (rev 57695)
@@ -847,7 +847,7 @@
def list_substring(quickie, libname):
for q in quickie:
- if libname.find(q) != -1:
+ if q in libname:
return True
return False
Modified: branches/soc-2013-depsgraph_mt/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/scons/tools/btools.py 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/build_files/scons/tools/btools.py 2013-06-24 12:30:05 UTC (rev 57695)
@@ -674,10 +674,10 @@
if platform == 'linux':
import platform
- if env['BF_INSTALLDIR'].find('glibc27') != -1:
- glibc="glibc27"
- elif env['BF_INSTALLDIR'].find('glibc211') != -1:
- glibc="glibc211"
+ if "glibc27" in env['BF_INSTALLDIR']:
+ glibc = "glibc27"
+ elif "glibc211" in env['BF_INSTALLDIR']:
+ glibc = "glibc211"
bitness = platform.architecture()[0]
if bitness == '64bit':
Modified: branches/soc-2013-depsgraph_mt/doc/python_api/examples/mathutils.Vector.py
===================================================================
--- branches/soc-2013-depsgraph_mt/doc/python_api/examples/mathutils.Vector.py 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/doc/python_api/examples/mathutils.Vector.py 2013-06-24 12:30:05 UTC (rev 57695)
@@ -4,7 +4,7 @@
vec = mathutils.Vector((0.0, 0.0, 1.0))
# unit length vector
-vec_a = vec.copy().normalize()
+vec_a = vec.normalized()
vec_b = mathutils.Vector((0.0, 1.0, 2.0))
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py 2013-06-24 12:18:28 UTC (rev 57694)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py 2013-06-24 12:30:05 UTC (rev 57695)
@@ -85,7 +85,7 @@
sub.prop(cscene, "mesh_light_samples", text="Mesh Light")
sub.prop(cscene, "subsurface_samples", text="Subsurface")
- if cscene.feature_set == 'EXPERIMENTAL':
+ if cscene.feature_set == 'EXPERIMENTAL' and (device_type == 'NONE' or cscene.device == 'CPU'):
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list