[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57547] branches/soc-2013-paint: merge with trunk version 57545
Antony Riakiotakis
kalast at gmail.com
Tue Jun 18 13:50:16 CEST 2013
Revision: 57547
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57547
Author: psy-fi
Date: 2013-06-18 11:50:15 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
merge with trunk version 57545
Modified Paths:
--------------
branches/soc-2013-paint/CMakeLists.txt
branches/soc-2013-paint/SConstruct
branches/soc-2013-paint/build_files/build_environment/install_deps.sh
branches/soc-2013-paint/build_files/buildbot/slave_compile.py
branches/soc-2013-paint/build_files/cmake/Modules/FindOpenEXR.cmake
branches/soc-2013-paint/build_files/cmake/macros.cmake
branches/soc-2013-paint/build_files/scons/tools/btools.py
branches/soc-2013-paint/intern/cycles/CMakeLists.txt
branches/soc-2013-paint/intern/cycles/SConscript
branches/soc-2013-paint/intern/cycles/blender/addon/properties.py
branches/soc-2013-paint/intern/cycles/blender/addon/ui.py
branches/soc-2013-paint/intern/cycles/blender/blender_object.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_session.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_sync.h
branches/soc-2013-paint/intern/cycles/bvh/bvh.cpp
branches/soc-2013-paint/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_emission.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_montecarlo.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_projection.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-paint/intern/cycles/kernel/kernel_types.h
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_normal_map.osl
branches/soc-2013-paint/intern/cycles/kernel/svm/svm.h
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2013-paint/intern/cycles/render/light.cpp
branches/soc-2013-paint/intern/cycles/render/object.cpp
branches/soc-2013-paint/intern/cycles/render/osl.cpp
branches/soc-2013-paint/intern/cycles/render/shader.cpp
branches/soc-2013-paint/intern/cycles/render/shader.h
branches/soc-2013-paint/intern/cycles/render/svm.cpp
branches/soc-2013-paint/intern/cycles/util/util_opencl.cpp
branches/soc-2013-paint/intern/cycles/util/util_types.h
branches/soc-2013-paint/release/datafiles/blender_icons.svg
branches/soc-2013-paint/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-paint/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2013-paint/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/soc-2013-paint/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2013-paint/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_paint_common.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-paint/scons/scons-time.py
branches/soc-2013-paint/scons/scons.py
branches/soc-2013-paint/scons/sconsign.py
branches/soc-2013-paint/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_node.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_scene.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_tracking.h
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/lamp.c
branches/soc-2013-paint/source/blender/blenkernel/intern/library.c
branches/soc-2013-paint/source/blender/blenkernel/intern/material.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mball.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-paint/source/blender/blenkernel/intern/nla.c
branches/soc-2013-paint/source/blender/blenkernel/intern/node.c
branches/soc-2013-paint/source/blender/blenkernel/intern/scene.c
branches/soc-2013-paint/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-paint/source/blender/blenkernel/intern/texture.c
branches/soc-2013-paint/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-paint/source/blender/blenkernel/intern/world.c
branches/soc-2013-paint/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2013-paint/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-paint/source/blender/blenlib/BLI_string.h
branches/soc-2013-paint/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-paint/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-paint/source/blender/blenlib/intern/string.c
branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-paint/source/blender/collada/TransformWriter.cpp
branches/soc-2013-paint/source/blender/collada/collada_utils.cpp
branches/soc-2013-paint/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2013-paint/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2013-paint/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2013-paint/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2013-paint/source/blender/editors/include/ED_mesh.h
branches/soc-2013-paint/source/blender/editors/include/ED_object.h
branches/soc-2013-paint/source/blender/editors/include/ED_transform.h
branches/soc-2013-paint/source/blender/editors/include/UI_icons.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/interface/interface_widgets.c
branches/soc-2013-paint/source/blender/editors/mesh/editface.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_rip.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/mesh_intern.h
branches/soc-2013-paint/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-paint/source/blender/editors/mesh/meshtools.c
branches/soc-2013-paint/source/blender/editors/object/object_bake.c
branches/soc-2013-paint/source/blender/editors/object/object_vgroup.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-paint/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2013-paint/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2013-paint/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2013-paint/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-paint/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-paint/source/blender/editors/space_image/image_ops.c
branches/soc-2013-paint/source/blender/editors/space_nla/nla_edit.c
branches/soc-2013-paint/source/blender/editors/space_node/drawnode.c
branches/soc-2013-paint/source/blender/editors/space_node/node_add.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_select.c
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_ops.c
branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-paint/source/blender/freestyle/CMakeLists.txt
branches/soc-2013-paint/source/blender/freestyle/intern/application/AppCanvas.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/Silhouette.h
branches/soc-2013-paint/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-paint/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-paint/source/blender/makesdna/DNA_armature_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2013-paint/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2013-paint/source/blender/nodes/NOD_composite.h
branches/soc-2013-paint/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2013-paint/source/blender/python/intern/bpy_rna.c
branches/soc-2013-paint/source/blender/render/intern/source/convertblender.c
branches/soc-2013-paint/source/blender/render/intern/source/pipeline.c
branches/soc-2013-paint/source/blender/render/intern/source/sss.c
branches/soc-2013-paint/source/blender/render/intern/source/zbuf.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-paint/source/creator/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2013-paint/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-paint/source/gameengine/Ketsji/KX_KetsjiEngine.h
Added Paths:
-----------
branches/soc-2013-paint/scons/scons-local/
branches/soc-2013-paint/scons/scons-local/SCons/
branches/soc-2013-paint/scons/scons-local/SCons/Action.py
branches/soc-2013-paint/scons/scons-local/SCons/Builder.py
branches/soc-2013-paint/scons/scons-local/SCons/CacheDir.py
branches/soc-2013-paint/scons/scons-local/SCons/Conftest.py
branches/soc-2013-paint/scons/scons-local/SCons/Debug.py
branches/soc-2013-paint/scons/scons-local/SCons/Defaults.py
branches/soc-2013-paint/scons/scons-local/SCons/Environment.py
branches/soc-2013-paint/scons/scons-local/SCons/Errors.py
branches/soc-2013-paint/scons/scons-local/SCons/Executor.py
branches/soc-2013-paint/scons/scons-local/SCons/Job.py
branches/soc-2013-paint/scons/scons-local/SCons/Memoize.py
branches/soc-2013-paint/scons/scons-local/SCons/Node/
branches/soc-2013-paint/scons/scons-local/SCons/Node/Alias.py
branches/soc-2013-paint/scons/scons-local/SCons/Node/FS.py
branches/soc-2013-paint/scons/scons-local/SCons/Node/Python.py
branches/soc-2013-paint/scons/scons-local/SCons/Node/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/
branches/soc-2013-paint/scons/scons-local/SCons/Options/BoolOption.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/EnumOption.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/ListOption.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/PackageOption.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/PathOption.py
branches/soc-2013-paint/scons/scons-local/SCons/Options/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/PathList.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/
branches/soc-2013-paint/scons/scons-local/SCons/Platform/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/aix.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/cygwin.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/darwin.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/hpux.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/irix.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/os2.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/posix.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/sunos.py
branches/soc-2013-paint/scons/scons-local/SCons/Platform/win32.py
branches/soc-2013-paint/scons/scons-local/SCons/SConf.py
branches/soc-2013-paint/scons/scons-local/SCons/SConsign.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/C.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/D.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/Dir.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/Fortran.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/IDL.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/LaTeX.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/Prog.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/RC.py
branches/soc-2013-paint/scons/scons-local/SCons/Scanner/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Script/
branches/soc-2013-paint/scons/scons-local/SCons/Script/Interactive.py
branches/soc-2013-paint/scons/scons-local/SCons/Script/Main.py
branches/soc-2013-paint/scons/scons-local/SCons/Script/SConsOptions.py
branches/soc-2013-paint/scons/scons-local/SCons/Script/SConscript.py
branches/soc-2013-paint/scons/scons-local/SCons/Script/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Sig.py
branches/soc-2013-paint/scons/scons-local/SCons/Subst.py
branches/soc-2013-paint/scons/scons-local/SCons/Taskmaster.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/
branches/soc-2013-paint/scons/scons-local/SCons/Tool/386asm.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/BitKeeper.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/CVS.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/FortranCommon.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/GettextCommon.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/JavaCommon.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/arch.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/common.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/netframework.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/sdk.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/vc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/MSCommon/vs.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/Perforce.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/PharLapCommon.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/RCS.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/SCCS.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/Subversion.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/aixc++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/aixcc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/aixf77.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/aixlink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/applelink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ar.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/as.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/bcc32.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/c++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/cc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/cvf.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/default.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/dmd.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/dvi.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/dvipdf.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/dvips.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/f03.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/f77.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/f90.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/f95.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/filesystem.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/fortran.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/g++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/g77.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gas.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gcc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gettext.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gfortran.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gnulink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/gs.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/hpc++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/hpcc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/hplink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/icc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/icl.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ifl.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ifort.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ilink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ilink32.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/install.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/intelc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/ipkg.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/jar.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/javac.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/javah.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/latex.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/lex.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/link.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/linkloc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/m4.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/masm.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/midl.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mingw.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/msgfmt.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/msginit.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/msgmerge.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mslib.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mslink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mssdk.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/msvc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/msvs.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mwcc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/mwld.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/nasm.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/ipk.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/msi.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/rpm.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/src_tarbz2.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/src_targz.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/src_zip.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/tarbz2.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/targz.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/packaging/zip.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/pdf.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/pdflatex.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/pdftex.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/qt.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/rmic.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/rpcgen.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/rpm.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/rpmutils.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sgiar.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sgic++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sgicc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sgilink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunar.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunc++.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/suncc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunf77.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunf90.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunf95.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/sunlink.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/swig.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/tar.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/tex.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/textfile.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/tlib.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/wix.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/xgettext.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/yacc.py
branches/soc-2013-paint/scons/scons-local/SCons/Tool/zip.py
branches/soc-2013-paint/scons/scons-local/SCons/Util.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/
branches/soc-2013-paint/scons/scons-local/SCons/Variables/BoolVariable.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/EnumVariable.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/ListVariable.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/PackageVariable.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/PathVariable.py
branches/soc-2013-paint/scons/scons-local/SCons/Variables/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/Warnings.py
branches/soc-2013-paint/scons/scons-local/SCons/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/
branches/soc-2013-paint/scons/scons-local/SCons/compat/__init__.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_builtins.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_collections.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_dbm.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_hashlib.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_io.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_sets.py
branches/soc-2013-paint/scons/scons-local/SCons/compat/_scons_subprocess.py
branches/soc-2013-paint/scons/scons-local/SCons/cpp.py
branches/soc-2013-paint/scons/scons-local/SCons/dblite.py
branches/soc-2013-paint/scons/scons-local/SCons/exitfuncs.py
Modified: branches/soc-2013-paint/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/CMakeLists.txt 2013-06-18 11:33:13 UTC (rev 57546)
+++ branches/soc-2013-paint/CMakeLists.txt 2013-06-18 11:50:15 UTC (rev 57547)
@@ -1124,26 +1124,22 @@
${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
)
- set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
set(OPENCOLLADA_LIBRARIES
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAFramework.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADABaseUtils.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAStreamWriter.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/MathMLSolver.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/GeneratedSaxParser.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/xml.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/buffer.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/ftoa.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/UTF.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADAFramework.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADABaseUtils.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADAStreamWriter.lib
+ ${OPENCOLLADA}/lib/opencollada/MathMLSolver.lib
+ ${OPENCOLLADA}/lib/opencollada/GeneratedSaxParser.lib
+ ${OPENCOLLADA}/lib/opencollada/xml.lib
+ ${OPENCOLLADA}/lib/opencollada/buffer.lib
+ ${OPENCOLLADA}/lib/opencollada/ftoa.lib
+ ${OPENCOLLADA}/lib/opencollada/UTF.lib
)
set(PCRE_LIBRARIES
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/pcre.lib
+ ${OPENCOLLADA}/lib/opencollada/pcre.lib
)
-
- unset(OPENCOLLADA_LIBPATH)
-
endif()
if(WITH_CODEC_FFMPEG)
@@ -1172,7 +1168,7 @@
endif()
if(WITH_IMAGE_OPENEXR)
- set_lib_path(OPENEXR "openexr")
+ set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -1199,18 +1195,11 @@
endif()
if(WITH_PYTHON)
- # normally cached but not since we include them with blender
- if(MSVC10)
- set(PYTHON_VERSION 3.3) # CACHE STRING)
- else()
- set(PYTHON_VERSION 3.3) # CACHE STRING)
- endif()
+ set(PYTHON_VERSION 3.3) # CACHE STRING)
- set_lib_path(PYTHON "python")
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
- # set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
unset(_PYTHON_VERSION_NO_DOTS)
# Shared includes for both vc2008 and vc2010
@@ -1228,10 +1217,6 @@
set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_POSTFIX "vc110-mt-s-1_53.lib")
set(BOOST_DEBUG_POSTFIX "vc110-mt-sgd-1_53.lib")
- elseif(MSVC10)
- set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
- set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
- set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
else()
set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
@@ -2084,13 +2069,6 @@
endif()
-# MSVC2010 fails to links C++ libs right
-if(MSVC10)
- if(WITH_OPENCOLLADA)
- message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
- endif()
-endif()
-
# ensure python header is found since detection can fail, this could happen
# with _any_ library but since we used a fixed python version this tends to
# be most problematic.
Modified: branches/soc-2013-paint/SConstruct
===================================================================
--- branches/soc-2013-paint/SConstruct 2013-06-18 11:33:13 UTC (rev 57546)
+++ branches/soc-2013-paint/SConstruct 2013-06-18 11:50:15 UTC (rev 57547)
@@ -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
@@ -151,9 +148,9 @@
btools.SetupSpawn(env)
else:
if bitness==64 and platform=='win32':
- env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+ env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64')
else:
- env = BlenderEnvironment(ENV = os.environ)
+ env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86')
if not env:
print "Could not create a build environment"
@@ -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-paint/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-paint/build_files/build_environment/install_deps.sh 2013-06-18 11:33:13 UTC (rev 57546)
+++ branches/soc-2013-paint/build_files/build_environment/install_deps.sh 2013-06-18 11:50:15 UTC (rev 57547)
@@ -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-paint/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2013-paint/build_files/buildbot/slave_compile.py 2013-06-18 11:33:13 UTC (rev 57546)
+++ branches/soc-2013-paint/build_files/buildbot/slave_compile.py 2013-06-18 11:50:15 UTC (rev 57547)
@@ -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:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list