[Bf-blender-cvs] [de60ee27138] experimental-build: 2.79 RC2 + smooth-curves branch

Alexander Gavrilov noreply at git.blender.org
Sun Aug 20 16:19:24 CEST 2017 

Commit: de60ee2713829ac51dba9f033e65dd8a30bf7d85
Author: Alexander Gavrilov
Date:   Sun Aug 20 17:16:39 2017 +0300
Branches: experimental-build
https://developer.blender.org/rBde60ee2713829ac51dba9f033e65dd8a30bf7d85

2.79 RC2 + smooth-curves branch

===================================================================

M	.gitignore
M	.gitmodules
M	GNUmakefile
D	build_files/build_environment/CMakeLists.txt
D	build_files/build_environment/cmake/alembic.cmake
D	build_files/build_environment/cmake/blendthumb.cmake
D	build_files/build_environment/cmake/blosc.cmake
D	build_files/build_environment/cmake/boost.cmake
D	build_files/build_environment/cmake/clang.cmake
D	build_files/build_environment/cmake/clew.cmake
D	build_files/build_environment/cmake/cuew.cmake
D	build_files/build_environment/cmake/faad.cmake
D	build_files/build_environment/cmake/ffmpeg.cmake
D	build_files/build_environment/cmake/fftw.cmake
D	build_files/build_environment/cmake/flac.cmake
D	build_files/build_environment/cmake/flexbison.cmake
D	build_files/build_environment/cmake/freeglut.cmake
D	build_files/build_environment/cmake/freetype.cmake
D	build_files/build_environment/cmake/glew.cmake
D	build_files/build_environment/cmake/glfw.cmake
D	build_files/build_environment/cmake/harvest.cmake
D	build_files/build_environment/cmake/hdf5.cmake
D	build_files/build_environment/cmake/hidapi.cmake
D	build_files/build_environment/cmake/iconv.cmake
D	build_files/build_environment/cmake/ilmbase.cmake
D	build_files/build_environment/cmake/jemalloc.cmake
D	build_files/build_environment/cmake/jpeg.cmake
D	build_files/build_environment/cmake/lame.cmake
D	build_files/build_environment/cmake/lapack.cmake
D	build_files/build_environment/cmake/llvm.cmake
D	build_files/build_environment/cmake/mingw.cmake
D	build_files/build_environment/cmake/numpy.cmake
D	build_files/build_environment/cmake/ogg.cmake
D	build_files/build_environment/cmake/openal.cmake
D	build_files/build_environment/cmake/opencollada.cmake
D	build_files/build_environment/cmake/opencolorio.cmake
D	build_files/build_environment/cmake/openexr.cmake
D	build_files/build_environment/cmake/openimageio.cmake
D	build_files/build_environment/cmake/openjpeg.cmake
D	build_files/build_environment/cmake/opensubdiv.cmake
D	build_files/build_environment/cmake/openvdb.cmake
D	build_files/build_environment/cmake/options.cmake
D	build_files/build_environment/cmake/orc.cmake
D	build_files/build_environment/cmake/osl.cmake
D	build_files/build_environment/cmake/png.cmake
D	build_files/build_environment/cmake/pthreads.cmake
D	build_files/build_environment/cmake/python.cmake
D	build_files/build_environment/cmake/requests.cmake
D	build_files/build_environment/cmake/schroedinger.cmake
D	build_files/build_environment/cmake/sdl.cmake
D	build_files/build_environment/cmake/setup_mingw32.cmake
D	build_files/build_environment/cmake/setup_mingw64.cmake
D	build_files/build_environment/cmake/sndfile.cmake
D	build_files/build_environment/cmake/spnav.cmake
D	build_files/build_environment/cmake/tbb.cmake
D	build_files/build_environment/cmake/theora.cmake
D	build_files/build_environment/cmake/tiff.cmake
D	build_files/build_environment/cmake/versions.cmake
D	build_files/build_environment/cmake/vorbis.cmake
D	build_files/build_environment/cmake/vpx.cmake
D	build_files/build_environment/cmake/webp.cmake
D	build_files/build_environment/cmake/x264.cmake
D	build_files/build_environment/cmake/xml2.cmake
D	build_files/build_environment/cmake/xvidcore.cmake
D	build_files/build_environment/cmake/zlib.cmake
D	build_files/build_environment/cmake/zlib_mingw.cmake
M	build_files/build_environment/install_deps.sh
R100	build_files/build_environment/patches/install_deps_llvm.diff	build_files/build_environment/install_deps_patches/llvm.patch
R100	build_files/build_environment/patches/install_deps_osl.diff	build_files/build_environment/install_deps_patches/osl.patch
D	build_files/build_environment/patches/alembic.diff
D	build_files/build_environment/patches/blosc.diff
D	build_files/build_environment/patches/clang.diff
D	build_files/build_environment/patches/cmake/modules/FindBlosc.cmake
D	build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake
D	build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
D	build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake
D	build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
D	build_files/build_environment/patches/cmake/modules/FindTBB.cmake
D	build_files/build_environment/patches/cmake/modules/SelectLibraryConfigurations.cmake
D	build_files/build_environment/patches/cmakelists_glew.txt
D	build_files/build_environment/patches/cmakelists_hidapi.txt
D	build_files/build_environment/patches/cmakelists_openvdb.txt
D	build_files/build_environment/patches/cmakelists_tbb.txt
D	build_files/build_environment/patches/cuew.diff
D	build_files/build_environment/patches/distutildebugflags.diff
D	build_files/build_environment/patches/ffmpeg.diff
D	build_files/build_environment/patches/fftw3.diff
D	build_files/build_environment/patches/hdf5.diff
D	build_files/build_environment/patches/hidapi.diff
D	build_files/build_environment/patches/libfaad.diff
D	build_files/build_environment/patches/llvm-alloca-fix.diff
D	build_files/build_environment/patches/ming32sh.cmd
D	build_files/build_environment/patches/ming64sh.cmd
D	build_files/build_environment/patches/numpy.diff
D	build_files/build_environment/patches/opencollada.diff
D	build_files/build_environment/patches/opencolorio.diff
D	build_files/build_environment/patches/openexr.diff
D	build_files/build_environment/patches/openimageio_gdi.diff
D	build_files/build_environment/patches/openimageio_idiff.diff
D	build_files/build_environment/patches/openimageio_staticexr.diff
D	build_files/build_environment/patches/opensubdiv.diff
D	build_files/build_environment/patches/openvdb.diff
D	build_files/build_environment/patches/openvdb_vc2013.diff
D	build_files/build_environment/patches/osl.diff
D	build_files/build_environment/patches/osl_simd_oiio.diff
D	build_files/build_environment/patches/pthreads.diff
D	build_files/build_environment/patches/pyshell.diff
D	build_files/build_environment/patches/python.diff
D	build_files/build_environment/patches/python_apple.diff
D	build_files/build_environment/patches/python_runtime_vc2013.diff
D	build_files/build_environment/patches/schroedinger.diff
D	build_files/build_environment/patches/sdl.diff
D	build_files/build_environment/patches/semi.txt
D	build_files/build_environment/windows/build_deps.cmd
D	build_files/build_environment/windows/buildall.cmd
D	build_files/build_environment/windows/nuke.cmd
M	build_files/cmake/platform/platform_apple.cmake
M	build_files/cmake/platform/platform_win32_msvc.cmake
M	extern/cuew/README.blender
M	extern/cuew/include/cuew.h
M	extern/cuew/src/cuew.c
M	intern/cycles/blender/addon/presets.py
M	intern/cycles/blender/addon/properties.py
M	intern/cycles/blender/addon/ui.py
M	intern/cycles/blender/addon/version_update.py
M	intern/cycles/blender/blender_object.cpp
M	intern/cycles/blender/blender_sync.cpp
M	intern/cycles/bvh/bvh.cpp
M	intern/cycles/bvh/bvh2.cpp
M	intern/cycles/bvh/bvh4.cpp
M	intern/cycles/bvh/bvh_build.cpp
M	intern/cycles/device/CMakeLists.txt
M	intern/cycles/device/device.cpp
M	intern/cycles/device/device.h
M	intern/cycles/device/device_cpu.cpp
M	intern/cycles/device/device_cuda.cpp
M	intern/cycles/device/device_opencl.cpp
D	intern/cycles/device/opencl/memory_manager.cpp
D	intern/cycles/device/opencl/memory_manager.h
M	intern/cycles/device/opencl/opencl.h
M	intern/cycles/device/opencl/opencl_base.cpp
M	intern/cycles/device/opencl/opencl_mega.cpp
M	intern/cycles/device/opencl/opencl_split.cpp
M	intern/cycles/device/opencl/opencl_util.cpp
M	intern/cycles/kernel/CMakeLists.txt
M	intern/cycles/kernel/bvh/bvh.h
M	intern/cycles/kernel/bvh/bvh_shadow_all.h
M	intern/cycles/kernel/bvh/bvh_traversal.h
M	intern/cycles/kernel/bvh/qbvh_shadow_all.h
M	intern/cycles/kernel/bvh/qbvh_traversal.h
M	intern/cycles/kernel/filter/filter_features_sse.h
M	intern/cycles/kernel/filter/filter_nlm_cpu.h
M	intern/cycles/kernel/filter/filter_prefilter.h
M	intern/cycles/kernel/filter/filter_transform_sse.h
M	intern/cycles/kernel/geom/geom.h
M	intern/cycles/kernel/geom/geom_curve.h
D	intern/cycles/kernel/geom/geom_curve_intersect.h
M	intern/cycles/kernel/geom/geom_object.h
M	intern/cycles/kernel/kernel_accumulate.h
M	intern/cycles/kernel/kernel_compat_cuda.h
M	intern/cycles/kernel/kernel_compat_opencl.h
A	intern/cycles/kernel/kernel_debug.h
M	intern/cycles/kernel/kernel_emission.h
M	intern/cycles/kernel/kernel_globals.h
M	intern/cycles/kernel/kernel_image_opencl.h
M	intern/cycles/kernel/kernel_light.h
M	intern/cycles/kernel/kernel_passes.h
M	intern/cycles/kernel/kernel_path.h
M	intern/cycles/kernel/kernel_path_branched.h
M	intern/cycles/kernel/kernel_path_state.h
M	intern/cycles/kernel/kernel_random.h
M	intern/cycles/kernel/kernel_shader.h
M	intern/cycles/kernel/kernel_shadow.h
M	intern/cycles/kernel/kernel_textures.h
M	intern/cycles/kernel/kernel_types.h
M	intern/cycles/kernel/kernels/cpu/filter_sse41.cpp
M	intern/cycles/kernel/kernels/cuda/kernel_config.h
M	intern/cycles/kernel/kernels/cuda/kernel_split.cu
M	intern/cycles/kernel/kernels/opencl/kernel.cl
M	intern/cycles/kernel/kernels/opencl/kernel_data_init.cl
M	intern/cycles/kernel/kernels/opencl/kernel_split.cl
M	intern/cycles/kernel/kernels/opencl/kernel_split_function.h
M	intern/cycles/kernel/split/kernel_buffer_update.h
M	intern/cycles/kernel/split/kernel_data_init.h
M	intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
M	intern/cycles/kernel/split/kernel_indirect_background.h
M	intern/cycles/kernel/split/kernel_path_init.h
M	intern/cycles/kernel/split/kernel_scene_intersect.h
M	intern/cycles/kernel/split/kernel_shader_sort.h
M	intern/cycles/kernel/split/kernel_split_data_types.h
M	intern/cycles/render/image.cpp
M	intern/cycles/render/image.h
M	intern/cycles/render/integrator.cpp
M	intern/cycles/render/integrator.h
M	intern/cycles/render/light.cpp
M	intern/cycles/render/mesh.cpp
M	intern/cycles/render/object.cpp
M	intern/cycles/render/object.h
M	intern/cycles/render/osl.cpp
M	intern/cycles/render/scene.cpp
M	intern/cycles/render/scene.h
M	intern/cycles/render/session.cpp
M	intern/cycles/render/session.h
M	intern/cycles/render/shader.cpp
M	intern/cycles/render/tile.cpp
M	intern/cycles/render/tile.h
M	intern/cycles/util/CMakeLists.txt
D	intern/cycles/util/util_defines.h
M	intern/cycles/util/util_math.h
M	intern/cycles/util/util_math_float3.h
M	intern/cycles/util/util_math_float4.h
M	intern/cycles/util/util_math_matrix.h
M	intern/cycles/util/util_optimization.h
M	intern/cycles/util/util_path.cpp
M	intern/cycles/util/util_simd.h
M	intern/cycles/util/util_sseb.h
M	intern/cycles/util/util_ssef.h
M	intern/cycles/util/util_ssei.h
M	intern/cycles/util/util_types.h
M	intern/mikktspace/mikktspace.c
M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	release/scripts/presets/cycles/integrator/direct_light.py
M	release/scripts/presets/cycles/integrator/full_global_illumination.py
M	release/scripts/presets/cycles/integrator/limited_global_illumination.py
M	release/scripts/presets/cycles/sampling/final.py
M	release/scripts/presets/cycles/sampling/preview.py
M	release/scripts/startup/bl_operators/clip.py
M	release/scripts/startup/bl_ui/properties_render.py
D	release/windows/blendthumb/CMakeLists.txt
D	release/windows/blendthumb/src/BlendThumb.def
D	release/windows/blendthumb/src/BlendThumb.rc
D	release/windows/blendthumb/src/BlenderThumb.cpp
D	release/windows/blendthumb/src/Dll.cpp
M	source/blender/blenkernel/BKE_DerivedMesh.h
M	source/blender/blenkernel/BKE_action.h
M	source/blender/blenkernel/BKE_animsys.h
M	source/blender/blenkernel/BKE_armature.h
M	source/blender/blenkernel/BKE_blender_version.h
M	source/blender/blenkernel/BKE_brush.h
M	source/blender/blenkernel/BKE_cachefile.h
M	source/blender/blenkernel/BKE_camera.h
M	source/blender/blenkernel/BKE_constraint.h
M	source/blender/blenkernel/BKE_curve.h
M	source/blender/blenkernel/BKE_fcurve.h
M	source/blender/blenkernel/BKE_font.h
M	source/blender/blenkernel/BKE_freestyle.h
M	source/blender/blenkernel/BKE_gpencil.h
M	source/blender/blenkernel/BKE_group.h
M	source/blender/blenkernel/BKE_idprop.h
M	source/blender/blenkernel/BKE_image.h
M	source/blender/blenkernel/BKE_key.h
M	source/blender/blenkernel/BKE_lamp.h
M	source/blender/blenkernel/BKE_lattice.h
M	source/blender/blenkernel/BKE_library.h
M	source/blender/blenkernel/BKE_linestyle.h
M	source/blender/blenkernel/BKE_mask.h
M	source/blender/blenkernel/BKE_material.h
M	source/blender/blenkernel/BKE_mball.h
M	source/blender/blenkernel/BKE_mesh.h
M	source/blender/blenkernel/BKE_modifier.h
M	source/blender/blenkernel/BKE_movieclip.h
M	source/blender/blenkernel/BKE_node.h
M	source/blender/blenkernel/BKE_object.h
M	source/blender/blenkernel/BKE_paint.h
M	source/blender/blenkernel/BKE_particle.h
M	source/blender/blenkernel/BKE_pointcache.h
M	source/blender/blenkernel/BKE_rigidbody.h
M	source/blender/blenkernel/BKE_sca.h
M	source/blender/blenkernel/BKE_scene.h
M	source/blender/blenkernel/BKE_sequencer.h
M	source/blender/blenkernel/BKE_sound.h
M	source/blender/blenkernel/BKE_speaker.h
M	source/blender/blenkernel/BKE_text.h
M	source/blender/blenkernel/BKE_texture.h
M	source/blender/blenkernel/BKE_tracking.h
M	source/blender/blenkernel/BKE_world.h
M	source/blender/blenkernel/intern/DerivedMesh.c
M	source/blender/blenkernel/intern/action.c
M	source/blender/blenkernel/intern/anim_sys.c
M	source/blender/blenkernel/intern/appdir.c
M	source/blender/blenkernel/intern/armature.c
M	source/blender/blenkernel/intern/blendfile.c
M	source/blender/blenkernel/intern/brush.c
M	source/blender/blenkernel/intern/bvhutils.c
M	source/blender/blenkernel/intern/cachefile.c
M	source/blender/blenkernel/intern/camera.c
M	source/blender/blenkernel/intern/cdderivedmesh.c
M	source/blender/blenkernel/intern/cloth.c
M	source/blender/blenkernel/intern/constraint.c
M	source/blender/blenkernel/intern/curve.c
M	source/blender/blenkernel/intern/dynamicpaint.c
M	source/blender/blenkernel/intern/editderivedmesh.c
M	source/blender/blenkernel/intern/fcurve.c
M	source/blender/blenkernel/intern/fluidsim.c
M	source/blender/blenkernel/intern/fmodifier.c
M	source/blender/blenkernel/intern/font.c
M	source/blender/blenkernel/intern/freestyle.c
M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/blenkernel/intern/group.c
M	source/blender/blenkernel/intern/idprop.c
M	source/blender/blenkernel/intern/image.c
M	source/blender/blenkernel/intern/ipo.c
M	source/blender/blenkernel/intern/key.c
M	source/blender/blenkernel/intern/lamp.c
M	source/blender/blenkernel/intern/lattice.c
M	source/blender/blenkernel/intern/library.c
M	source/blender/blenkernel/intern/library_remap.c
M	source/blender/blenkernel/intern/linestyle.c
M	source/blender/blenkernel/intern/mask.c
M	source/blender/blenkernel/intern/material.c
M	source/blender/blenkernel/intern/mball.c
M	source/blender/blenkernel/intern/mesh.c
M	source/blender/blenkernel/intern/mesh_remap.c
M	source/blender/blenkernel/intern/modifier.c
M	source/blender/blenkernel/intern/movieclip.c
M	source/blender/blenkernel/intern/nla.c
M	source/blender/blenkernel/intern/node.c
M	source/blender/blenkernel/intern/object.c
M	source/blender/blenkernel/intern/paint.c
M	source/blender/blenkernel/intern/particle.c
M	source/blender/blenkernel/intern/pointcache.c
M	source/blender/blenkernel/intern/rigidbody.c
M	source/blender/blenkernel/intern/sca.c
M	source/blender/blenkernel/intern/scene.c
M	source/blender/blenkernel/intern/sequencer.c
M	source/blender/blenkernel/intern/smoke.c
M	source/blender/blenkernel/intern/sound.c
M	source/blender/blenkernel/intern/speaker.c
M	source/blender/blenkernel/intern/subsurf_ccg.c
M	source/blender/blenkernel/intern/text.c
M	source/blender/blenkernel/intern/texture.c
M	source/blender/blenkernel/intern/tracking.c
M	source/blender/blenkernel/intern/tracking_auto.c
M	source/blender/blenkernel/intern/tracking_util.c
M	source/blender/blenkernel/intern/world.c
M	source/blender/blenkernel/tracking_private.h
M	source/blender/blenlib/BLI_ghash.h
M	source/blender/blenlib/BLI_math_solvers.h
M	source/blender/blenlib/BLI_vfontdata.h
M	source/blender/blenlib/intern/freetypefont.c
M	source/blender/blenlib/intern/math_solvers.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/writefile.c
M	source/blender/blentranslation/CMakeLists.txt
M	source/blender/blentranslation/msgfmt/msgfmt.c
M	source/blender/bmesh/tools/bmesh_bevel.c
M	source/blender/depsgraph/intern/builder/deg_builder.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/editors/animation/drivers.c
M	source/blender/editors/animation/fmodifier_ui.c
M	source/blender/editors/animation/keyframing.c
M	source/blender/editors/armature/armature_edit.c
M	source/blender/editors/armature/armature_relations.c
M	source/blender/editors/curve/editcurve.c
M	source/blender/editors/curve/editcurve_paint.c
M	source/blender/editors/include/ED_anim_api.h
M	source/blender/editors/include/ED_armature.h
M	source/blender/editors/include/ED_transform.h
M	source/blender/editors/include/ED_transform_snap_object_context.h
M	source/blender/editors/include/ED_view3d.h
M	source/blender/editors/include/UI_resources.h
M	source/blender/editors/interface/interface_handlers.c
M	source/blender/editors/interface/interface_ops.c
M	source/blender/editors/io/io_cache.c
M	source/blender/editors/object/object_add.c
M	source/blender/editors/object/object_constraint.c
M	source/blender/editors/object/object_edit.c
M	source/blender/editors/object/object_relations.c
M	source/blender/editors/object/object_transform.c
M	source/blender/editors/physics/particle_edit.c
M	source/blender/editors/physics/particle_object.c
M	source/blender/editors/render/render_internal.c
M	source/blender/editors/render/render_shading.c
M	source/blender/editors/screen/screen_context.c
M	source/blender/editors/screen/screen_edit.c
M	source/blender/editors/space_action/action_edit.c
M	source/blender/editors/space_clip/clip_draw.c
M	source/blender/editors/space_clip/tracking_ops_track.c
M	source/blender/editors/space_graph/graph_buttons.c
M	source/blender/editors/space_graph/graph_edit.c
M	source/blender/editors/space_nla/nla_edit.c
M	source/blender/editors/space_sequencer/sequencer_edit.c
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/editors/space_view3d/view3d_ruler.c
M	source/blender/editors/space_view3d/view3d_view.c
M	source/blender/editors/space_view3d/view3d_walk.c
M	source/blender/editors/transform/transform_conversions.c
M	source/blender/editors/transform/transform_snap.c
M	source/blender/editors/transform/transform_snap_object.c
M	source/blender/gpu/GPU_material.h
M	source/blender/gpu/intern/gpu_material.c
M	source/blender/makesdna/DNA_ID.h
M	source/blender/makesdna/DNA_anim_types.h
M	source/blender/makesdna/DNA_curve_types.h
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/RNA_define.h
M	source/blender/makesrna/intern/makesrna.c
M	source/blender/makesrna/intern/rna_access.c
M	source/blender/makesrna/intern/rna_armature.c
M	source/blender/makesrna/intern/rna_curve_api.c
M	source/blender/makesrna/intern/rna_define.c
M	source/blender/makesrna/intern/rna_fcurve.c
M	source/blender/makesrna/intern/rna_internal_types.h
M	source/blender/makesrna/intern/rna_meta_api.c
M	source/blender/makesrna/intern/rna_nodetree.c
M	source/blender/makesrna/intern/rna_render.c
M	source/blender/makesrna/intern/rna_rna.c
M	source/blender/makesrna/intern/rna_scene.c
M	source/blender/makesrna/intern/rna_scene_api.c
M	source/blender/makesrna/intern/rna_space.c
M	source/blender/makesrna/intern/rna_ui.c
M	source/blender/makesrna/intern/rna_userdef.c
M	source/blender/makesrna/intern/rna_wm.c
M	source/blender/modifiers/intern/MOD_armature.c
M	source/blender/modifiers/intern/MOD_bevel.c
M	source/blender/modifiers/intern/MOD_collision.c
M	source/blender/modifiers/intern/MOD_displace.c
M	source/blender/modifiers/intern/MOD_laplaciandeform.c
M	source/blender/modifiers/intern/MOD_meshcache_pc2.c
M	source/blender/modifiers/intern/MOD_meshsequencecache.c
M	source/blender/modifiers/intern/MOD_wave.c
M	source/blender/modifiers/intern/MOD_weightvgedit.c
M	source/blender/modifiers/intern/MOD_weightvgmix.c
M	source/blender/modifiers/intern/MOD_weightvgproximity.c
M	source/blender/python/intern/bpy_operator_wrap.c
M	source/blender/python/intern/bpy_rna.c
M	source/blender/python/mathutils/mathutils_bvhtree.c
M	source/blender/render/intern/include/shading.h
M	source/blender/render/intern/source/shadeinput.c
M	source/blender/windowmanager/intern/wm.c
M	source/blender/windowmanager/intern/wm_files.c
M	source/blender/windowmanager/intern/wm_init_exit.c
M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/wm_files.h
M	source/blenderplayer/bad_level_call_stubs/stubs.c
M	source/creator/CMakeLists.txt
M	source/gameengine/VideoTexture/FilterBase.cpp
M	source/gameengine/VideoTexture/ImageBase.cpp
M	source/tools
M	tests/python/CMakeLists.txt
M	tests/python/bl_load_py_modules.py
M	tests/python/cycles_render_tests.py

===================================================================

diff --git a/.gitignore b/.gitignore
index 814b7661bc6..3418afebb58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,3 @@ Desktop.ini
 /doc/python_api/sphinx-in/
 /doc/python_api/sphinx-out/
 /doc/python_api/rst/bmesh.ops.rst
-
-# in-source lib downloads
-/build_files/build_environment/downloads
diff --git a/.gitmodules b/.gitmodules
index 2f52bfce372..bd1812d9618 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,7 +2,7 @@
 	path = release/scripts/addons
 	url = ../blender-addons.git
 	ignore = all
-	branch = master
+	branch = blender-v2.79-release
 [submodule "release/scripts/addons_contrib"]
 	path = release/scripts/addons_contrib
 	url = ../blender-addons-contrib.git
@@ -12,9 +12,9 @@
 	path = release/datafiles/locale
 	url = ../blender-translations.git
 	ignore = all
-	branch = master
+	branch = blender-v2.79-release
 [submodule "source/tools"]
 	path = source/tools
 	url = ../blender-dev-tools.git
 	ignore = all
-	branch = master
+	branch = blender-v2.79-release
diff --git a/GNUmakefile b/GNUmakefile
index d1e575cfc3c..ba7f89c3097 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -43,11 +43,6 @@ ifndef BUILD_DIR
 	BUILD_DIR:=$(shell dirname "$(BLENDER_DIR)")/build_$(OS_NCASE)
 endif
 
-# Dependencies DIR's
-DEPS_SOURCE_DIR:=$(BLENDER_DIR)/build_files/build_environment
-DEPS_BUILD_DIR:=$(BUILD_DIR)/deps
-DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE)
-
 # Allow to use alternative binary (pypy3, etc)
 ifndef PYTHON
 	PYTHON:=python3
@@ -91,7 +86,13 @@ ifndef NPROCS
 	ifeq ($(OS), Linux)
 		NPROCS:=$(shell nproc)
 	endif
-	ifneq (,$(filter $(OS),Darwin FreeBSD NetBSD))
+	ifeq ($(OS), Darwin)
+		NPROCS:=$(shell sysctl -n hw.ncpu)
+	endif
+	ifeq ($(OS), FreeBSD)
+		NPROCS:=$(shell sysctl -n hw.ncpu)
+	endif
+	ifeq ($(OS), NetBSD)
 		NPROCS:=$(shell sysctl -n hw.ncpu)
 	endif
 endif
@@ -145,27 +146,6 @@ cycles: all
 headless: all
 bpy: all
 
-# -----------------------------------------------------------------------------
-# Build dependencies
-DEPS_TARGET = install
-ifneq "$(findstring clean, $(MAKECMDGOALS))" ""
-	DEPS_TARGET = clean
-endif
-
-deps: .FORCE
-	@echo
-	@echo Configuring dependencies in \"$(DEPS_BUILD_DIR)\"
-
-	@cmake -H"$(DEPS_SOURCE_DIR)" \
-	       -B"$(DEPS_BUILD_DIR)" \
-		   -DHARVEST_TARGET=$(DEPS_INSTALL_DIR)
-
-	@echo
-	@echo Building dependencies ...
-	$(MAKE) -C "$(DEPS_BUILD_DIR)" -s -j $(NPROCS) $(DEPS_TARGET)
-	@echo
-	@echo Dependencies successfully built and installed to $(DEPS_INSTALL_DIR).
-	@echo
 
 # -----------------------------------------------------------------------------
 # Configuration (save some cd'ing around)
@@ -184,7 +164,6 @@ help: .FORCE
 	@echo "  * headless  - build without an interface (renderfarm or server automation)"
 	@echo "  * cycles    - build Cycles standalone only, without Blender"
 	@echo "  * bpy       - build as a python module which can be loaded from python directly"
-	@echo "  * deps      - build library dependencies (intended only for platform maintainers)"
 	@echo ""
 	@echo "  * config    - run cmake configuration tool to set build options"
 	@echo ""
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
deleted file mode 100644
index 5bcfd477d71..00000000000
--- a/build_files/build_environment/CMakeLists.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-####################################################################################################
-#
-# This is a build system used by platform maintainers to build library dependencies on
-# Windows and macOS. There is some support for Linux as well, but not ready for releases.
-#
-# Windows and macOS users should download the precompiled libraries in lib/, Linux users
-# should run install_deps.sh for building dependencies.
-#
-# WINDOWS USAGE:
-#   Don't call this cmake file your self, use build_deps.cmd
-#   build_deps 2013 x64 / build_deps 2013 x86
-#   build_deps 2015 x64 / build_deps 2015 x86
-#
-# MAC OS X USAGE:
-#	Install with homebrew: brew install autoconf automake libtool yasm openssl xz
-#   Run "make deps" from main Blender directory
-#
-# LINUX USAGE:
-#   Install compiler, cmake, autoconf, automake, libtool, yasm
-#   Run "make deps" from main Blender directory
-#
-####################################################################################################
-
-project("BlenderDependencies")
-cmake_minimum_required(VERSION 3.5)
-
-include(ExternalProject)
-include(cmake/options.cmake)
-include(cmake/versions.cmake)
-include(cmake/zlib.cmake)
-include(cmake/blendthumb.cmake)
-include(cmake/openal.cmake)
-include(cmake/png.cmake)
-include(cmake/jpeg.cmake)
-include(cmake/boost.cmake)
-include(cmake/blosc.cmake)
-include(cmake/pthreads.cmake)
-include(cmake/ilmbase.cmake)
-include(cmake/openexr.cmake)
-include(cmake/freetype.cmake)
-include(cmake/freeglut.cmake)
-include(cmake/glew.cmake)
-include(cmake/hdf5.cmake)
-include(cmake/alembic.cmake)
-include(cmake/glfw.cmake)
-include(cmake/clew.cmake)
-include(cmake/cuew.cmake)
-include(cmake/opensubdiv.cmake)
-include(cmake/sdl.cmake)
-include(cmake/opencollada.cmake)
-include(cmake/opencolorio.cmake)
-include(cmake/llvm.cmake)
-include(cmake/clang.cmake)
-include(cmake/openimageio.cmake)
-include(cmake/tiff.cmake)
-include(cmake/flexbison.cmake)
-include(cmake/osl.cmake)
-include(cmake/tbb.cmake)
-include(cmake/openvdb.cmake)
-include(cmake/python.cmake)
-include(cmake/requests.cmake)
-include(cmake/numpy.cmake)
-include(cmake/webp.cmake)
-if(WIN32)
-	include(cmake/hidapi.cmake)
-endif()
-
-if(ENABLE_MINGW64)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		include(cmake/setup_mingw64.cmake)
-	else()
-		include(cmake/setup_mingw32.cmake)
-	endif()
-else()
-	set(mingw_LIBDIR ${LIBDIR})
-endif()
-
-if(NOT WIN32 OR ENABLE_MINGW64)
-	if(BUILD_MODE STREQUAL Release)
-		if(WIN32)
-			include(cmake/zlib_mingw.cmake)
-		endif()
-		include(cmake/lame.cmake)
-		include(cmake/ogg.cmake)
-		include(cmake/vorbis.cmake)
-		include(cmake/theora.cmake)
-		include(cmake/vpx.cmake)
-		include(cmake/orc.cmake)
-		include(cmake/schroedinger.cmake)
-		include(cmake/x264.cmake)
-		include(cmake/xvidcore.cmake)
-		include(cmake/openjpeg.cmake)
-		include(cmake/faad.cmake)
-		include(cmake/ffmpeg.cmake)
-		include(cmake/fftw.cmake)
-		include(cmake/sndfile.cmake)
-		if(WIN32)
-			include(cmake/iconv.cmake)
-			include(cmake/lapack.cmake)
-		endif()
-		if(UNIX)
-			include(cmake/flac.cmake)
-			if(NOT APPLE)
-				include(cmake/spnav.cmake)
-				include(cmake/jemalloc.cmake)
-				include(cmake/xml2.cmake)
-			endif()
-		endif()
-	endif()
-endif()
-
-include(cmake/harvest.cmake)
diff --git a/build_files/build_environment/cmake/alembic.cmake b/build_files/build_environment/cmake/alembic.cmake
deleted file mode 100644
index a49047ec102..00000000000
--- a/build_files/build_environment/cmake/alembic.cmake
+++ /dev/null
@@ -1,75 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-if(ALEMBIC_HDF5)
-	set(ALEMBIC_HDF5_HL)
-	# in debug mode we do not build HDF5_hdf5_hl_LIBRARY which makes cmake really
-	# unhappy, stub it with the debug mode lib. it's not linking it in at this
-	# point in time anyhow
-	if(BUILD_MODE STREQUAL Debug)
-		set(ALEMBIC_HDF5_HL -DHDF5_hdf5_hl_LIBRARY=${LIBDIR}/hdf5/lib/libhdf5_hl_D.${LIBEXT})
-	endif()
-endif()
-
-set(ALEMBIC_EXTRA_ARGS
-	-DBUILDSTATIC=ON
-	-DLINKSTATIC=ON
-	-DALEMBIC_LIB_USES_BOOST=ON
-	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-	-DBoost_USE_MULTITHREADED=ON
-	-DUSE_STATIC_BOOST=On
-	-DBoost_USE_STATIC_LIBS=ON
-	-DBoost_USE_STATIC_RUNTIME=ON
-	-DBoost_DEBUG=ON
-	-DBOOST_ROOT=${LIBDIR}/boost
-	-DBoost_NO_SYSTEM_PATHS=ON
-	-DILMBASE_ROOT=${LIBDIR}/ilmbase
-	-DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/ilmbase/include/OpenEXR
-	-DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${LIBEXT}
-	-DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
-	-DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-	-DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
-	-DUSE_PYILMBASE=0
-	-DUSE_PYALEMBIC=0
-	-DUSE_ARNOLD=0
-	-DUSE_MAYA=0
-	-DUSE_PRMAN=0
-	-DUSE_HDF5=Off
-	-DUSE_STATIC_HDF5=Off
-	-DHDF5_ROOT=${LIBDIR}/hdf5
-	-DUSE_TESTS=Off
-	-DALEMBIC_NO_OPENGL=1
-	-DUSE_BINARIES=ON
-	-DALEMBIC_ILMBASE_LINK_STATIC=On
-	-DALEMBIC_SHARED_LIBS=OFF
-	-DGLUT_INCLUDE_DIR=""
-	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-	${ALEMBIC_HDF5_HL}
-)
-
-ExternalProject_Add(external_alembic
-	URL ${ALEMBIC_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${ALEMBIC_MD5}
-	PREFIX ${BUILD_DIR}/alembic
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LI

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list