[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57629] branches/soc-2013-depsgraph_mt: Merging r57605 through r57628 from trunk into soc-2013-depsgraph_mt

Sergey Sharybin sergey.vfx at gmail.com
Fri Jun 21 12:12:11 CEST 2013


Revision: 57629
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57629
Author:   nazgul
Date:     2013-06-21 10:12:10 +0000 (Fri, 21 Jun 2013)
Log Message:
-----------
Merging r57605 through r57628 from trunk into soc-2013-depsgraph_mt

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57605
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57628

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh
    branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
    branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
    branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-mac-i386.py
    branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-mac-x86_64.py
    branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_compile.py
    branches/soc-2013-depsgraph_mt/build_files/scons/config/darwin-config.py
    branches/soc-2013-depsgraph_mt/build_files/scons/config/linux-config.py
    branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-mingw-config.py
    branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-vc-config.py
    branches/soc-2013-depsgraph_mt/build_files/scons/config/win64-mingw-config.py
    branches/soc-2013-depsgraph_mt/build_files/scons/config/win64-vc-config.py
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device_cuda.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/SConscript
    branches/soc-2013-depsgraph_mt/intern/cycles/util/util_types.h
    branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/paint.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_ghash.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_mempool.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/shadeinput.c
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/zbuf.c
    branches/soc-2013-depsgraph_mt/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2013-depsgraph_mt/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp

Property Changed:
----------------
    branches/soc-2013-depsgraph_mt/
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/


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-57604
   + /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

Modified: branches/soc-2013-depsgraph_mt/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/CMakeLists.txt	2013-06-21 08:53:03 UTC (rev 57628)
+++ branches/soc-2013-depsgraph_mt/CMakeLists.txt	2013-06-21 10:12:10 UTC (rev 57629)
@@ -264,7 +264,7 @@
 option(WITH_CYCLES_TEST				"Build cycles test application" OFF)
 option(WITH_CYCLES_OSL				"Build Cycles with OSL support" OFF)
 option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 

Modified: branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh	2013-06-21 08:53:03 UTC (rev 57628)
+++ branches/soc-2013-depsgraph_mt/build_files/build_environment/install_deps.sh	2013-06-21 10:12:10 UTC (rev 57629)
@@ -1550,7 +1550,7 @@
       tar -C $SRC --transform "s,(.*/?)OpenShadingLanguage-[^/]*(.*),\1OpenShadingLanguage-$OSL_VERSION\2,x" \
           -xf $_src.tar.gz
       cd $_src
-      git checkout blender-fixes
+      #git checkout blender-fixes
       cd $CWD
     fi
 
@@ -2278,8 +2278,18 @@
     fi
 
     _suse_rel="`grep VERSION /etc/SuSE-release | gawk '{print $3}'`"
-    sudo zypper ar -f http://packman.inode.at/suse/openSUSE_$_suse_rel/ packman
 
+    INFO ""
+    INFO "About to add 'packman' repository from http://packman.inode.at/suse/openSUSE_$_suse_rel/"
+    INFO "This is only needed if you do not already have a packman repository enabled..."
+    read -p "Do you want to add this repo (Y/n)?"
+    if [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" == "y" ]; then
+      INFO "    Installing packman..."
+      sudo zypper ar --refresh --name 'Packman Repository' http://ftp.gwdg.de/pub/linux/packman/suse/openSUSE_$_suse_rel/ ftp.gwdg.de-suse
+      INFO "    Done."
+    else
+      INFO "    Skipping packman installation."
+    fi
     sudo zypper --non-interactive --gpg-auto-import-keys update --auto-agree-with-licenses
   fi
 

Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-cuda-glibc211-i686.py	2013-06-21 08:53:03 UTC (rev 57628)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-cuda-glibc211-i686.py	2013-06-21 10:12:10 UTC (rev 57629)
@@ -2,4 +2,4 @@
 BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
 BF_NUMJOBS = 1
 
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']

Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py	2013-06-21 08:53:03 UTC (rev 57628)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py	2013-06-21 10:12:10 UTC (rev 57629)
@@ -2,4 +2,4 @@
 BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
 BF_NUMJOBS = 1
 
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']

Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-mac-i386.py	2013-06-21 08:53:03 UTC (rev 57628)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-mac-i386.py	2013-06-21 10:12:10 UTC (rev 57629)
@@ -315,7 +315,7 @@
 
 WITH_BF_CYCLES_CUDA_BINARIES = True
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
 
 #Freestyle
 WITH_BF_FREESTYLE = True

Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-mac-x86_64.py	2013-06-21 08:53:03 UTC (rev 57628)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/config/user-config-mac-x86_64.py	2013-06-21 10:12:10 UTC (rev 57629)
@@ -315,7 +315,7 @@
 
 WITH_BF_CYCLES_CUDA_BINARIES = True
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
 
 #Freestyle
 WITH_BF_FREESTYLE = True

Modified: branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_compile.py	2013-06-21 08:53:03 UTC (rev 57628)
+++ branches/soc-2013-depsgraph_mt/build_files/buildbot/slave_compile.py	2013-06-21 10:12:10 UTC (rev 57629)
@@ -155,9 +155,9 @@
 
             scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config))
 
-        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
-
         if builder.find('win') != -1:
+            if not os.path.exists(install_dir):
+                os.makedirs(install_dir)
             if builder.endswith('vc2012'):
                 dlls = ('msvcp110.dll', 'msvcr110.dll', 'vcomp110.dll')
             else:
@@ -169,4 +169,6 @@
             for dll in dlls:
                 shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll))
 
+        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+
         sys.exit(retcode)

Modified: branches/soc-2013-depsgraph_mt/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/scons/config/darwin-config.py	2013-06-21 08:53:03 UTC (rev 57628)
+++ branches/soc-2013-depsgraph_mt/build_files/scons/config/darwin-config.py	2013-06-21 10:12:10 UTC (rev 57629)
@@ -315,7 +315,7 @@
 
 WITH_BF_CYCLES_CUDA_BINARIES = False
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
 
 #Freestyle
 WITH_BF_FREESTYLE = True

Modified: branches/soc-2013-depsgraph_mt/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/scons/config/linux-config.py	2013-06-21 08:53:03 UTC (rev 57628)
+++ branches/soc-2013-depsgraph_mt/build_files/scons/config/linux-config.py	2013-06-21 10:12:10 UTC (rev 57629)
@@ -210,7 +210,7 @@
 
 WITH_BF_CYCLES_CUDA_BINARIES = False
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
 
 WITH_BF_OPENMP = True
 

Modified: branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-mingw-config.py	2013-06-21 08:53:03 UTC (rev 57628)
+++ branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-mingw-config.py	2013-06-21 10:12:10 UTC (rev 57629)
@@ -149,7 +149,7 @@
 WITH_BF_CYCLES = True
 WITH_BF_CYCLES_CUDA_BINARIES = False
 BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
 
 WITH_BF_OIIO = True
 BF_OIIO = LIBDIR + '/openimageio'

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-21 08:53:03 UTC (rev 57628)
+++ branches/soc-2013-depsgraph_mt/build_files/scons/config/win32-vc-config.py	2013-06-21 10:12:10 UTC (rev 57629)
@@ -215,7 +215,7 @@
 #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']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list