[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57499] branches/soc-2013-dingto: Merged revision(s) 57423-57498 from trunk/blender into soc-2013-dingto
Thomas Dinges
blender at dingto.org
Sun Jun 16 14:05:40 CEST 2013
Revision: 57499
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57499
Author: dingto
Date: 2013-06-16 12:05:39 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
Merged revision(s) 57423-57498 from trunk/blender into soc-2013-dingto
Modified Paths:
--------------
branches/soc-2013-dingto/SConstruct
branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
branches/soc-2013-dingto/build_files/buildbot/slave_compile.py
branches/soc-2013-dingto/build_files/scons/tools/btools.py
branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel_montecarlo.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_projection.h
branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_normal_map.osl
branches/soc-2013-dingto/intern/cycles/kernel/svm/svm.h
branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2013-dingto/intern/cycles/util/util_opencl.cpp
branches/soc-2013-dingto/release/datafiles/blender_icons.svg
branches/soc-2013-dingto/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-dingto/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-dingto/scons/scons-time.py
branches/soc-2013-dingto/scons/scons.py
branches/soc-2013-dingto/scons/sconsign.py
branches/soc-2013-dingto/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_scene.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/node.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/scene.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_string.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-dingto/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-dingto/source/blender/blenlib/intern/string.c
branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-dingto/source/blender/collada/TransformWriter.cpp
branches/soc-2013-dingto/source/blender/collada/collada_utils.cpp
branches/soc-2013-dingto/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2013-dingto/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2013-dingto/source/blender/editors/include/ED_mesh.h
branches/soc-2013-dingto/source/blender/editors/include/ED_transform.h
branches/soc-2013-dingto/source/blender/editors/include/UI_icons.h
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_intern.h
branches/soc-2013-dingto/source/blender/editors/mesh/editface.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-dingto/source/blender/editors/mesh/meshtools.c
branches/soc-2013-dingto/source/blender/editors/object/object_bake.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-dingto/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2013-dingto/source/blender/editors/space_image/image_ops.c
branches/soc-2013-dingto/source/blender/editors/space_node/drawnode.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_generics.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_ops.c
branches/soc-2013-dingto/source/blender/freestyle/CMakeLists.txt
branches/soc-2013-dingto/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/Silhouette.h
branches/soc-2013-dingto/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-dingto/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-dingto/source/blender/makesdna/DNA_armature_types.h
branches/soc-2013-dingto/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_rna.c
branches/soc-2013-dingto/source/blender/render/intern/source/convertblender.c
branches/soc-2013-dingto/source/blender/render/intern/source/pipeline.c
branches/soc-2013-dingto/source/blender/render/intern/source/sss.c
branches/soc-2013-dingto/source/blender/render/intern/source/zbuf.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_GameObject.cpp
Added Paths:
-----------
branches/soc-2013-dingto/scons/scons-local/
Removed Paths:
-------------
branches/soc-2013-dingto/scons/scons-local-1.2.0.d20090223/
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
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:57315-57365,57369-57422
+ /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:57315-57365,57369-57498
Modified: branches/soc-2013-dingto/SConstruct
===================================================================
--- branches/soc-2013-dingto/SConstruct 2013-06-16 11:14:07 UTC (rev 57498)
+++ branches/soc-2013-dingto/SConstruct 2013-06-16 12:05:39 UTC (rev 57499)
@@ -46,9 +46,7 @@
import os.path
import string
import shutil
-import glob
import re
-from tempfile import mkdtemp
# store path to tools
toolpath=os.path.join(".", "build_files", "scons", "tools")
@@ -58,7 +56,6 @@
import Blender
import btools
-import bcolors
EnsureSConsVersion(1,0,0)
@@ -121,7 +118,7 @@
if bitness:
B.bitness = bitness
-else:
+else:
B.bitness = tempbitness
@@ -172,6 +169,10 @@
elif env['CC'] in ['gcc']:
platform = 'win64-mingw' if bitness == 64 else 'win32-mingw'
+if 'mingw' in platform:
+ print "Setting custom spawn function"
+ btools.SetupSpawn(env)
+
env.SConscriptChdir(0)
# Remove major kernel version from linux platform.
@@ -303,7 +304,7 @@
env.Append(LINKFLAGS=['-F/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
env['BF_3DMOUSE_INC'] = '/Library/Frameworks/3DconnexionClient.framework/Headers'
- # for now, Mac builders must download and install the JackOSX framework
+ # for now, Mac builders must download and install the JackOSX framework
# necessary header file lives here when installed:
# /Library/Frameworks/Jackmp.framework/Versions/A/Headers/jack.h
if env['WITH_BF_JACK'] == 1:
@@ -313,13 +314,13 @@
else:
env.Append(LINKFLAGS=['-L/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp'])
- if env['WITH_BF_CYCLES_OSL'] == 1:
+ if env['WITH_BF_CYCLES_OSL'] == 1:
OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
# we need 2 variants of passing the oslexec with the force_load option, string and list type atm
env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
env.Append(BF_PROGRAM_LINKFLAGS=['-Xlinker','-force_load','-Xlinker',OSX_OSL_LIBPATH +'/liboslexec.a'])
- # Trying to get rid of eventually clashes, we export some explicite as local symbols
+ # Trying to get rid of eventually clashes, we export some explicite as local symbols
env.Append(LINKFLAGS=['-Xlinker','-unexported_symbols_list','-Xlinker','./source/creator/osx_locals.map'])
if env['WITH_BF_OPENMP'] == 1:
@@ -330,10 +331,10 @@
env.Append(LINKFLAGS=['-openmp', '-static-intel'])
env['CCFLAGS'].append('-openmp')
else:
- env.Append(CCFLAGS=['-fopenmp'])
+ env.Append(CCFLAGS=['-fopenmp'])
if env['WITH_GHOST_COCOA'] == True:
- env.Append(CPPFLAGS=['-DGHOST_COCOA'])
+ env.Append(CPPFLAGS=['-DGHOST_COCOA'])
if env['USE_QTKIT'] == True:
env.Append(CPPFLAGS=['-DUSE_QTKIT'])
@@ -370,7 +371,7 @@
# build with ocean sim?
if env['WITH_BF_OCEANSIM'] == 1:
- env['WITH_BF_FFTW3'] = 1 # ocean needs fftw3 so enable it
+ env['WITH_BF_FFTW3'] = 1 # ocean needs fftw3 so enable it
env['CPPFLAGS'].append('-DWITH_MOD_OCEANSIM')
@@ -517,10 +518,10 @@
filename_only = os.path.basename(FILE_FROM)
FILE_TO = os.path.join(env['DATA_SOURCES'], filename_only + ".c")
VAR_NAME = "datatoc_" + filename_only.replace(".", "_")
-
+
data_to_c(FILE_FROM, FILE_TO, VAR_NAME)
-
+
if B.targets != ['cudakernels']:
data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl",
B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
@@ -960,7 +961,7 @@
else:
dllsources.append('${LCGDIR}/opencolorio/bin/libOpenColorIO.dll')
-
+
dllsources.append('#source/icons/blender.exe.manifest')
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
@@ -990,7 +991,7 @@
if(env['WITH_BF_OPENMP']):
dllsources.append('${LCGDIR}/binaries/libgomp-1.dll')
-
+
if env['WITH_BF_OCIO']:
dllsources.append('${LCGDIR}/opencolorio/bin/libOpenColorIO.dll')
Modified: branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-06-16 11:14:07 UTC (rev 57498)
+++ branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-06-16 12:05:39 UTC (rev 57499)
@@ -1158,7 +1158,7 @@
compile_OIIO() {
# To be changed each time we make edits that would modify the compiled result!
- oiio_magic=11
+ oiio_magic=12
_init_oiio
# Clean install if needed!
@@ -1352,6 +1352,7 @@
# Optional tests and cmd tools
cmake_d="$cmake_d -D USE_QT=OFF"
+ cmake_d="$cmake_d -D USE_PYTHON=OFF"
cmake_d="$cmake_d -D BUILD_TESTING=OFF"
#cmake_d="$cmake_d -D CMAKE_EXPORT_COMPILE_COMMANDS=ON"
#cmake_d="$cmake_d -D CMAKE_VERBOSE_MAKEFILE=ON"
@@ -1373,6 +1374,7 @@
# if [ -d $INST/ocio ]; then
# cmake_d="$cmake_d -D OCIO_PATH=$INST/ocio"
# fi
+ cmake_d="$cmake_d -D USE_OCIO=OFF"
if file /bin/cp | grep -q '32-bit'; then
cflags="-fPIC -m32 -march=i686"
Modified: branches/soc-2013-dingto/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2013-dingto/build_files/buildbot/slave_compile.py 2013-06-16 11:14:07 UTC (rev 57498)
+++ branches/soc-2013-dingto/build_files/buildbot/slave_compile.py 2013-06-16 12:05:39 UTC (rev 57499)
@@ -143,6 +143,8 @@
scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
if builder.find('mingw') != -1:
scons_options.append('BF_TOOLSET=mingw')
+ scons_options.append('BF_NUMJOBS=1')
+
elif builder.find('mac') != -1:
if builder.find('x86_64') != -1:
config = 'user-config-mac-x86_64.py'
@@ -156,9 +158,9 @@
if builder.find('win') != -1:
dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest')
if builder.find('win64') == -1:
- dlls_path = 'C:\\b\\redist\\x86'
+ dlls_path = '..\\..\\..\\redist\\x86'
else:
- dlls_path = 'C:\\b\\redist\\amd64'
+ dlls_path = '..\\..\\..\\redist\\amd64'
for dll in dlls:
shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll))
Modified: branches/soc-2013-dingto/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2013-dingto/build_files/scons/tools/btools.py 2013-06-16 11:14:07 UTC (rev 57498)
+++ branches/soc-2013-dingto/build_files/scons/tools/btools.py 2013-06-16 12:05:39 UTC (rev 57499)
@@ -8,7 +8,6 @@
except ImportError:
pass
import string
-import glob
import shutil
import sys
@@ -58,7 +57,7 @@
def get_revision():
build_rev = os.popen('svnversion').read()[:-1] # remove \n
- if build_rev == '' or build_rev==None:
+ if build_rev == '' or build_rev==None:
build_rev = 'UNKNOWN'
return 'r' + build_rev
@@ -169,7 +168,7 @@
'WITH_BF_CYCLES_OSL', 'WITH_BF_STATICOSL', 'BF_OSL', 'BF_OSL_INC', 'BF_OSL_LIB', 'BF_OSL_LIBPATH', 'BF_OSL_LIB_STATIC', 'BF_OSL_COMPILER',
'WITH_BF_LLVM', 'WITH_BF_STATICLLVM', 'BF_LLVM', 'BF_LLVM_LIB', 'BF_LLVM_LIBPATH', 'BF_LLVM_LIB_STATIC', 'BF_PROGRAM_LINKFLAGS'
]
-
+
# Have options here that scons expects to be lists
opts_list_split = [
'BF_PYTHON_LINKFLAGS',
@@ -183,8 +182,8 @@
'LLIBS', 'PLATFORM_LINKFLAGS','MACOSX_ARCHITECTURE', 'MACOSX_SDK_CHECK', 'XCODE_CUR_VER',
'BF_CYCLES_CUDA_BINARIES_ARCH', 'BF_PROGRAM_LINKFLAGS', 'MACOSX_DEPLOYMENT_TARGET'
]
-
-
+
+
arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME',
'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE', 'BF_LINE_OVERWRITE',
@@ -225,14 +224,13 @@
print '\t'+bc.WARNING+'Invalid target: '+bc.ENDC+t
return oklist
-class ourSpawn:
+class OurSpawn:
def ourspawn(self, sh, escape, cmd, args, env):
- newargs = string.join(args[1:], ' ')
+ newargs = " ".join(args[1:])
cmdline = cmd + " " + newargs
startupinfo = subprocess.STARTUPINFO()
- #startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
- stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list