[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57628] branches/soc-2013-paint: Merge trunk -r57626 into soc-2013-paint

Antony Riakiotakis kalast at gmail.com
Fri Jun 21 10:53:03 CEST 2013


Revision: 57628
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57628
Author:   psy-fi
Date:     2013-06-21 08:53:03 +0000 (Fri, 21 Jun 2013)
Log Message:
-----------
Merge trunk -r57626 into soc-2013-paint

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

Modified Paths:
--------------
    branches/soc-2013-paint/CMakeLists.txt
    branches/soc-2013-paint/build_files/build_environment/install_deps.sh
    branches/soc-2013-paint/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
    branches/soc-2013-paint/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
    branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-i386.py
    branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-x86_64.py
    branches/soc-2013-paint/build_files/buildbot/slave_compile.py
    branches/soc-2013-paint/build_files/scons/config/darwin-config.py
    branches/soc-2013-paint/build_files/scons/config/linux-config.py
    branches/soc-2013-paint/build_files/scons/config/win32-mingw-config.py
    branches/soc-2013-paint/build_files/scons/config/win32-vc-config.py
    branches/soc-2013-paint/build_files/scons/config/win64-mingw-config.py
    branches/soc-2013-paint/build_files/scons/config/win64-vc-config.py
    branches/soc-2013-paint/intern/audaspace/intern/AUD_Sequencer.cpp
    branches/soc-2013-paint/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/soc-2013-paint/intern/cycles/CMakeLists.txt
    branches/soc-2013-paint/intern/cycles/SConscript
    branches/soc-2013-paint/intern/cycles/device/device_cuda.cpp
    branches/soc-2013-paint/intern/cycles/device/device_opencl.cpp
    branches/soc-2013-paint/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2013-paint/intern/cycles/kernel/SConscript
    branches/soc-2013-paint/intern/cycles/kernel/kernel_bvh_traversal.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_jitter.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_shader.h
    branches/soc-2013-paint/intern/cycles/util/util_cuda.cpp
    branches/soc-2013-paint/intern/cycles/util/util_cuda.h
    branches/soc-2013-paint/intern/cycles/util/util_types.h
    branches/soc-2013-paint/release/scripts/startup/bl_ui/__init__.py
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2013-paint/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/displist.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/editmesh_bvh.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/paint.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2013-paint/source/blender/blenlib/BLI_ghash.h
    branches/soc-2013-paint/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2013-paint/source/blender/blenlib/intern/BLI_heap.c
    branches/soc-2013-paint/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2013-paint/source/blender/bmesh/bmesh_class.h
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_mesh.c
    branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_path.c
    branches/soc-2013-paint/source/blender/editors/include/ED_mesh.h
    branches/soc-2013-paint/source/blender/editors/include/UI_interface.h
    branches/soc-2013-paint/source/blender/editors/interface/interface.c
    branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-paint/source/blender/editors/interface/interface_intern.h
    branches/soc-2013-paint/source/blender/editors/interface/interface_layout.c
    branches/soc-2013-paint/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-paint/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2013-paint/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-paint/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2013-paint/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2013-paint/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2013-paint/source/blender/editors/object/object_vgroup.c
    branches/soc-2013-paint/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2013-paint/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2013-paint/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2013-paint/source/blender/editors/space_clip/space_clip.c
    branches/soc-2013-paint/source/blender/editors/space_file/file_intern.h
    branches/soc-2013-paint/source/blender/editors/space_file/filesel.c
    branches/soc-2013-paint/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2013-paint/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2013-paint/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_iterators.c
    branches/soc-2013-paint/source/blender/editors/transform/transform.c
    branches/soc-2013-paint/source/blender/editors/transform/transform.h
    branches/soc-2013-paint/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-paint/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-paint/source/blender/editors/transform/transform_snap.c
    branches/soc-2013-paint/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
    branches/soc-2013-paint/source/blender/render/intern/source/pipeline.c
    branches/soc-2013-paint/source/blender/render/intern/source/shadeinput.c
    branches/soc-2013-paint/source/blender/render/intern/source/zbuf.c
    branches/soc-2013-paint/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-paint/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2013-paint/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2013-paint/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/soc-2013-paint/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2013-paint/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
    branches/soc-2013-paint/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2013-paint/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2013-paint/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2013-paint/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2013-paint/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2013-paint/source/gameengine/VideoTexture/ImageRender.cpp

Added Paths:
-----------
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_properties.py

Removed Paths:
-------------
    branches/soc-2013-paint/source/blender/editors/space_buttons/buttons_header.c

Modified: branches/soc-2013-paint/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/CMakeLists.txt	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/CMakeLists.txt	2013-06-21 08:53:03 UTC (rev 57628)
@@ -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)
 
@@ -562,12 +562,12 @@
 if(UNIX AND NOT APPLE)
 	macro(find_package_wrapper)
 		string(TOUPPER ${ARGV0} _NAME_UPPER)
-		if(${WITH_STATIC_LIBS})
+		if(WITH_STATIC_LIBS)
 			set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
 			set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
 		endif()
 		find_package(${ARGV})
-		if(${WITH_STATIC_LIBS})
+		if(WITH_STATIC_LIBS)
 			set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
 			unset(_cmake_find_library_suffixes_back)
 		endif()
@@ -707,7 +707,7 @@
 	if(WITH_BOOST)
 		# uses in build instructions to override include and library variables
 		if(NOT BOOST_CUSTOM)
-			if(${WITH_STATIC_LIBS})
+			if(WITH_STATIC_LIBS)
 				set(Boost_USE_STATIC_LIBS ON)
 			endif()
 			set(Boost_USE_MULTITHREADED ON)

Modified: branches/soc-2013-paint/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-paint/build_files/build_environment/install_deps.sh	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/build_files/build_environment/install_deps.sh	2013-06-21 08:53:03 UTC (rev 57628)
@@ -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-paint/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
===================================================================
--- branches/soc-2013-paint/build_files/buildbot/config/user-config-cuda-glibc211-i686.py	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/build_files/buildbot/config/user-config-cuda-glibc211-i686.py	2013-06-21 08:53:03 UTC (rev 57628)
@@ -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-paint/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
===================================================================
--- branches/soc-2013-paint/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py	2013-06-21 08:53:03 UTC (rev 57628)
@@ -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-paint/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-i386.py	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-i386.py	2013-06-21 08:53:03 UTC (rev 57628)
@@ -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-paint/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-x86_64.py	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/build_files/buildbot/config/user-config-mac-x86_64.py	2013-06-21 08:53:03 UTC (rev 57628)
@@ -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-paint/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2013-paint/build_files/buildbot/slave_compile.py	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/build_files/buildbot/slave_compile.py	2013-06-21 08:53:03 UTC (rev 57628)
@@ -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-paint/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2013-paint/build_files/scons/config/darwin-config.py	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/build_files/scons/config/darwin-config.py	2013-06-21 08:53:03 UTC (rev 57628)
@@ -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-paint/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2013-paint/build_files/scons/config/linux-config.py	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/build_files/scons/config/linux-config.py	2013-06-21 08:53:03 UTC (rev 57628)
@@ -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-paint/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2013-paint/build_files/scons/config/win32-mingw-config.py	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/build_files/scons/config/win32-mingw-config.py	2013-06-21 08:53:03 UTC (rev 57628)
@@ -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-paint/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2013-paint/build_files/scons/config/win32-vc-config.py	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/build_files/scons/config/win32-vc-config.py	2013-06-21 08:53:03 UTC (rev 57628)
@@ -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']
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True

Modified: branches/soc-2013-paint/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2013-paint/build_files/scons/config/win64-mingw-config.py	2013-06-21 07:04:54 UTC (rev 57627)
+++ branches/soc-2013-paint/build_files/scons/config/win64-mingw-config.py	2013-06-21 08:53:03 UTC (rev 57628)
@@ -146,7 +146,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-paint/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2013-paint/build_files/scons/config/win64-vc-config.py	2013-06-21 07:04:54 UTC (rev 57627)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list