[Bf-blender-cvs] [8e9ef816aa0] experimental-build: build for experiment
Darshan Kadu
noreply at git.blender.org
Mon Jul 24 17:27:16 CEST 2017
Commit: 8e9ef816aa0e7221b6e4e827210b7a4e9c684401
Author: Darshan Kadu
Date: Mon Jul 24 17:58:18 2017 +0530
Branches: experimental-build
https://developer.blender.org/rB8e9ef816aa0e7221b6e4e827210b7a4e9c684401
build for experiment
===================================================================
M CMakeLists.txt
M build_files/build_environment/install_deps.sh
M build_files/buildbot/config/blender_linux_player.cmake
M build_files/cmake/Modules/FindOpenCOLLADA.cmake
M build_files/cmake/platform/platform_win32_msvc.cmake
M doc/python_api/examples/bpy.app.translations.py
M doc/python_api/examples/bpy.types.Operator.5.py
M doc/python_api/rst/bge.app.rst
M doc/python_api/rst/gpu.rst
M doc/python_api/rst/include__bmesh.rst
M doc/python_api/rst/info_overview.rst
D doc/python_api/rst/info_tutorial_addon.rst
M doc/python_api/rst_from_bmesh_opdefines.py
M doc/python_api/sphinx_doc_gen.py
A doc/python_api/static/blender_logo.svg
R100 doc/python_api/blender-org/static/favicon.ico doc/python_api/static/favicon.ico
M intern/cycles/blender/addon/engine.py
M intern/cycles/blender/addon/properties.py
M intern/cycles/blender/addon/ui.py
M intern/cycles/blender/blender_session.cpp
M intern/cycles/blender/blender_sync.cpp
M intern/cycles/blender/blender_sync.h
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_denoising.cpp
M intern/cycles/device/device_denoising.h
M intern/cycles/device/device_opencl.cpp
M intern/cycles/device/device_split_kernel.cpp
M intern/cycles/device/device_split_kernel.h
M intern/cycles/device/opencl/opencl.h
M intern/cycles/device/opencl/opencl_base.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/closure/bsdf_microfacet.h
M intern/cycles/kernel/closure/bsdf_microfacet_multi.h
M intern/cycles/kernel/filter/filter_features.h
M intern/cycles/kernel/filter/filter_nlm_cpu.h
M intern/cycles/kernel/filter/filter_nlm_gpu.h
M intern/cycles/kernel/filter/filter_prefilter.h
M intern/cycles/kernel/filter/filter_reconstruction.h
M intern/cycles/kernel/kernel_accumulate.h
M intern/cycles/kernel/kernel_passes.h
M intern/cycles/kernel/kernel_path_state.h
M intern/cycles/kernel/kernel_queues.h
M intern/cycles/kernel/kernel_subsurface.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/kernel/kernel_volume.h
M intern/cycles/kernel/kernels/cpu/filter_cpu.h
M intern/cycles/kernel/kernels/cpu/filter_cpu_impl.h
M intern/cycles/kernel/kernels/cpu/kernel_cpu.h
M intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
M intern/cycles/kernel/kernels/cuda/filter.cu
M intern/cycles/kernel/kernels/cuda/kernel_split.cu
M intern/cycles/kernel/kernels/opencl/filter.cl
M intern/cycles/kernel/kernels/opencl/kernel_buffer_update.cl
M intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl
M intern/cycles/kernel/kernels/opencl/kernel_do_volume.cl
A intern/cycles/kernel/kernels/opencl/kernel_enqueue_inactive.cl
M intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl
M intern/cycles/kernel/kernels/opencl/kernel_indirect_background.cl
M intern/cycles/kernel/kernels/opencl/kernel_indirect_subsurface.cl
M intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
M intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl
M intern/cycles/kernel/kernels/opencl/kernel_path_init.cl
M intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl
M intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl
M intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl
M intern/cycles/kernel/kernels/opencl/kernel_shader_setup.cl
M intern/cycles/kernel/kernels/opencl/kernel_shader_sort.cl
M intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_ao.cl
M intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked_dl.cl
M intern/cycles/kernel/kernels/opencl/kernel_split.cl
A intern/cycles/kernel/kernels/opencl/kernel_split_function.h
M intern/cycles/kernel/kernels/opencl/kernel_subsurface_scatter.cl
M intern/cycles/kernel/osl/osl_bssrdf.cpp
M intern/cycles/kernel/osl/osl_closures.cpp
M intern/cycles/kernel/shaders/node_principled_bsdf.osl
M intern/cycles/kernel/shaders/stdosl.h
M intern/cycles/kernel/split/kernel_branched.h
M intern/cycles/kernel/split/kernel_do_volume.h
A intern/cycles/kernel/split/kernel_enqueue_inactive.h
M intern/cycles/kernel/split/kernel_next_iteration_setup.h
M intern/cycles/kernel/split/kernel_scene_intersect.h
M intern/cycles/kernel/split/kernel_shadow_blocked_dl.h
M intern/cycles/kernel/split/kernel_split_common.h
M intern/cycles/kernel/split/kernel_split_data_types.h
M intern/cycles/kernel/split/kernel_subsurface_scatter.h
M intern/cycles/kernel/svm/svm_closure.h
M intern/cycles/render/nodes.cpp
M intern/cycles/render/nodes.h
M intern/cycles/render/session.cpp
M intern/cycles/test/util_string_test.cpp
M intern/cycles/util/util_atomic.h
M intern/cycles/util/util_progress.h
M intern/cycles/util/util_string.cpp
M intern/ghost/GHOST_C-api.h
M intern/ghost/intern/GHOST_WindowCocoa.h
M intern/guardedalloc/intern/mallocn_lockfree_impl.c
M intern/libmv/ChangeLog
M intern/libmv/bundle.sh
M intern/memutil/MEM_CacheLimiterC-Api.h
M intern/opensubdiv/opensubdiv_capi.cc
M intern/opensubdiv/opensubdiv_capi.h
D p1.orig
D p1.rej
M release/datafiles/blender_icons.svg
A release/datafiles/blender_icons16/icon16_outliner_ob_force_field.dat
A release/datafiles/blender_icons16/icon16_outliner_ob_group_instance.dat
A release/datafiles/blender_icons32/icon32_outliner_ob_force_field.dat
A release/datafiles/blender_icons32/icon32_outliner_ob_group_instance.dat
M release/datafiles/colormanagement/config.ocio
M release/scripts/freestyle/modules/freestyle/__init__.py
M release/scripts/modules/bl_i18n_utils/settings.py
M release/scripts/modules/sys_info.py
M release/scripts/startup/bl_ui/properties_animviz.py
M release/scripts/startup/bl_ui/properties_data_armature.py
M release/scripts/startup/bl_ui/properties_data_camera.py
M release/scripts/startup/bl_ui/properties_data_curve.py
M release/scripts/startup/bl_ui/properties_data_lamp.py
M release/scripts/startup/bl_ui/properties_data_metaball.py
M release/scripts/startup/bl_ui/properties_game.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/properties_material.py
M release/scripts/startup/bl_ui/properties_object.py
M release/scripts/startup/bl_ui/properties_particle.py
M release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
M release/scripts/startup/bl_ui/properties_physics_field.py
M release/scripts/startup/bl_ui/properties_physics_smoke.py
M release/scripts/startup/bl_ui/properties_physics_softbody.py
M release/scripts/startup/bl_ui/properties_texture.py
M release/scripts/startup/bl_ui/properties_world.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_time.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
D release/scripts/startup/bl_ui/space_view3d.py.orig
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
D release/scripts/startup/bl_ui/space_view3d_toolbar.py.orig
D release/scripts/startup/io_mesh_ply_soc/__init__.py
D release/scripts/startup/io_mesh_ply_soc/export_ply_soc.py
D release/scripts/startup/io_mesh_ply_soc/import_ply_soc.py
D release/scripts/startup/io_scene_fbx_soc/__init__.py
D release/scripts/startup/io_scene_fbx_soc/data_types.py
D release/scripts/startup/io_scene_fbx_soc/encode_bin.py
D release/scripts/startup/io_scene_fbx_soc/export_fbx_bin_soc.py
D release/scripts/startup/io_scene_fbx_soc/export_fbx_soc.py
D release/scripts/startup/io_scene_fbx_soc/fbx2json.py
D release/scripts/startup/io_scene_fbx_soc/fbx_utils.py
D release/scripts/startup/io_scene_fbx_soc/import_fbx_soc.py
D release/scripts/startup/io_scene_fbx_soc/json2fbx.py
D release/scripts/startup/io_scene_fbx_soc/parse_fbx.py
M release/scripts/startup/keyingsets_builtins.py
A sh.exe.stackdump
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/alembic/intern/abc_util.cc
M source/blender/alembic/intern/abc_util.h
M source/blender/alembic/intern/alembic_capi.cc
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_boids.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_colortools.h
M source/blender/blenkernel/BKE_curve.h
M source/blender/blenkernel/BKE_deform.h
M source/blender/blenkernel/BKE_fcurve.h
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/BKE_group.h
M source/blender/blenkernel/BKE_icons.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_movieclip.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_paint.h
D source/blender/blenkernel/BKE_paint.h.orig
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_pbvh.h
D source/blender/blenkernel/BKE_pbvh.h.orig
M source/blender/blenkernel/BKE_property.h
M source/blender/blenkernel/BKE_rigidbody.h
M source/blender/blenkernel/BKE_sca.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/CCGSubSurf.c
D source/blender/blenkernel/intern/CCGSubSurf.c.orig
M source/blender/blenkernel/intern/DerivedMesh.c
D source/blender/blenkernel/intern/DerivedMesh.c.orig
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/armature_update.c
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/boids.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
D source/blender/blenkernel/intern/cdderivedmesh.c.orig
M source/blender/blenkernel/intern/colortools.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/deform.c
M source/blender/blenkernel/intern/editderivedmesh.c
M source/blender/blenkernel/intern/effect.c
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenkernel/intern/fmodifier.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/group.c
M source/blender/blenkernel/intern/icons.c
M source/blender/blenkernel/intern/image.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_evaluate.c
M source/blender/blenkernel/intern/mesh_mapping.c
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/object.c
D source/blender/blenkernel/intern/object.c.orig
M source/blender/blenkernel/intern/object_update.c
M source/blender/blenkernel/intern/ocean.c
M source/blender/blenkernel/intern/paint.c
D source/blender/blenkernel/intern/paint.c.orig
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/particle_child.c
M source/blender/blenkernel/intern/particle_distribute.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/pbvh.c
D source/blender/blenkernel/intern/pbvh.c.orig
M source/blender/blenkernel/intern/pbvh_intern.h
D source/blender/blenkernel/intern/pbvh_intern.h.orig
M source/blender/blenkernel/intern/property.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/seqeffects.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenkernel/intern/speaker.c
M source/blender/blenkernel/intern/subsurf_ccg.c
D source/blender/blenkernel/intern/subsurf_ccg.c.orig
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_stabilize.c
M source/blender/blenkernel/intern/world.c
M source/blender/blenlib/BLI_array.h
M source/blender/blenlib/BLI_kdopbvh.h
M source/blender/blenlib/BLI_math_rotation.h
M source/blender/blenlib/BLI_math_vector.h
M source/blender/blenlib/BLI_rect.h
M source/blender/blenlib/BLI_stack.h
M source/blender/blenlib/BLI_strict_flags.h
M source/blender/blenlib/BLI_task.h
M source/blender/blenlib/intern/BLI_ghash.c
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenlib/intern/array_store.c
M source/blender/blenlib/intern/math_color_blend_inline.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/math_matrix.c
M source/blender/blenlib/intern/math_rotation.c
M source/blender/blenlib/intern/math_vector.c
M source/blender/blenlib/intern/rct.c
M source/blender/blenlib/intern/storage.c
M source/blender/blenlib/intern/string_utf8.c
M source/blender/blenlib/intern/task.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_270.c
D source/blender/blenloader/intern/versioning_270.c.orig
M source/blender/blenloader/intern/versioning_defaults.c
D source/blender/blenloader/intern/versioning_defaults.c.orig
M source/blender/bmesh/intern/bmesh_opdefines.c
M source/blender/bmesh/intern/bmesh_queries.c
M source/blender/bmesh/operators/bmo_bevel.c
M source/blender/bmesh/operators/bmo_connect_pair.c
M source/blender/bmesh/operators/bmo_removedoubles.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/GeometryExporter.cpp
D source/blender/collada/GeometryExporter.cpp.orig
M source/blender/collada/MeshImporter.cpp
M source/blender/compositor/nodes/COM_ImageNode.cpp
M source/blender/depsgraph/CMakeLists.txt
M source/blender/depsgraph/DEG_depsgraph_build.h
M source/blender/depsgraph/intern/builder/deg_builder.cc
M source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
M source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
M source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
M source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
M source/blender/depsgraph/intern/depsgraph.cc
M source/blender/depsgraph/intern/depsgraph.h
M source/blender/depsgraph/intern/depsgraph_build.cc
M source/blender/depsgraph/intern/depsgraph_debug.cc
M source/blender/depsgraph/intern/depsgraph_eval.cc
M source/blender/depsgraph/intern/depsgraph_query.cc
M source/blender/depsgraph/intern/depsgraph_tag.cc
M source/blender/depsgraph/intern/depsgraph_type_defines.cc
M source/blender/depsgraph/intern/depsgraph_types.h
M source/blender/depsgraph/intern/eval/deg_eval.cc
M source/blender/depsgraph/intern/eval/deg_eval_debug.cc
M source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M source/blender/depsgraph/intern/nodes/deg_node.cc
M source/blender/depsgraph/intern/nodes/deg_node.h
M source/blender/depsgraph/intern/nodes/deg_node_component.cc
M source/blender/depsgraph/intern/nodes/deg_node_component.h
M source/blender/depsgraph/intern/nodes/deg_node_operation.cc
M source/blender/depsgraph/intern/nodes/deg_node_operation.h
M source/blender/editors/animation/keyframes_edit.c
M source/blender/editors/armature/armature_naming.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/include/UI_icons.h
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/io/io_alembic.c
M source/blender/editors/mesh/editmesh_add.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_bake_api.c
M source/blender/editors/object/object_group.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/physics/dynamicpaint_ops.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/physics/physics_pointcache.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/sculpt_paint/paint_image.c
D source/blender/editors/sculpt_paint/paint_image.c.orig
M source/blender/editors/sculpt_paint/paint_intern.h
D source/blender/editors/sculpt_paint/paint_intern.h.orig
M source/blender/editors/sculpt_paint/paint_ops.c
D source/blender/editors/sculpt_paint/paint_ops.c.orig
M source/blender/editors/sculpt_paint/paint_vertex.c
D source/blender/editors/sculpt_paint/paint_vertex.c.orig
M source/blender/editors/sculpt_paint/sculpt.c
D source/blender/editors/sculpt_paint/sculpt.c.orig
M source/blender/editors/sculpt_paint/sculpt_intern.h
D source/blender/editors/sculpt_paint/sculpt_intern.h.orig
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_nla/nla_buttons.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_text/text_autocomplete.c
M source/blender/editors/space_text/text_format_pov.c
M source/blender/editors/space_text/text_format_pov_ini.c
M source/blender/editors/space_view3d/drawobject.c
D source/blender/editors/space_view3d/drawobject.c.orig
M source/blender/editors/space_view3d/view3d_header.c
D source/blender/editors/space_view3d/view3d_header.c.orig
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_input.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/editors/uvedit/uvedit_parametrizer.c
M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M source/blender/freestyle/intern/geometry/matrix_util.h
M source/blender/gpu/intern/gpu_buffers.c
D source/blender/gpu/intern/gpu_buffers.c.orig
M source/blender/gpu/intern/gpu_select.c
M source/blender/gpu/intern/gpu_select_sample_query.c
M source/blender/gpu/shaders/gpu_shader_material.glsl
M source/blender/imbuf/IMB_imbuf.h
M source/blender/imbuf/IMB_imbuf_types.h
M source/blender/imbuf/intern/allocimbuf.c
M source/blender/imbuf/intern/cineon/dpxlib.c
M source/blender/makesdna/DNA_brush_types.h
D source/blender/makesdna/DNA_brush_types.h.orig
M source/blender/makesdna/DNA_object_types.h
D source/blender/makesdna/DNA_object_types.h.orig
M source/blender/makesdna/DNA_scene_types.h
D source/blender/makesdna/DNA_scene_types.h.orig
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_brush.c
D source/blender/makesrna/intern/rna_brush.c.orig
M source/blender/makesrna/intern/rna_mesh.c
D source/blender/makesrna/intern/rna_mesh.c.orig
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
D source/blender/makesrna/intern/rna_sculpt_paint.c.orig
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_curve.c
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_dynamicpaint.c
M source/blender/modifiers/intern/MOD_fluidsim.c
M source/blender/modifiers/intern/MOD_fluidsim_util.c
M source/blender/modifiers/intern/MOD_meshdeform.c
M source/blender/modifiers/intern/MOD_ocean.c
M source/blender/modifiers/intern/MOD_surfacedeform.c
M source/blender/modifiers/intern/MOD_uvproject.c
M source/blender/nodes/composite/nodes/node_composite_image.c
M source/blender/nodes/composite/nodes/node_composite_switchview.c
M source/blender/nodes/intern/node_exec.c
M source/blender/nodes/shader/node_shader_util.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
M source/blender/nodes/shader/nodes/node_shader_normal_map.c
M source/blender/python/intern/CMakeLists.txt
M source/blender/python/intern/bpy_app.c
A source/blender/python/intern/bpy_app_opensubdiv.c
A source/blender/python/intern/bpy_app_opensubdiv.h
M source/blender/python/intern/bpy_app_sdl.c
M source/blender/python/intern/bpy_operator_wrap.c
M source/blender/python/intern/bpy_operator_wrap.h
M source/blender/python/intern/bpy_props.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/mathutils/mathutils.c
M source/blender/render/intern/source/bake_api.c
M source/blender/render/intern/source/rendercore.c
M source/blender/render/intern/source/sunsky.c
M source/blender/render/intern/source/zbuf.c
M source/blender/windowmanager/intern/wm.c
M source/blender/windowmanager/intern/wm_files.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
M source/gameengine/GamePlayer/common/GPC_MouseDevice.h
M source/gameengine/Ketsji/KX_SoundActuator.cpp
A tests/gtests/blenlib/BLI_kdopbvh_test.cc
M tests/gtests/blenlib/BLI_path_util_test.cc
M tests/gtests/blenlib/CMakeLists.txt
M tests/python/CMakeLists.txt
M tests/python/alembic_tests.py
M tests/python/bl_alembic_import_test.py
M tests/python/bl_keymap_completeness.py
M tests/python/bl_load_py_modules.py
M tests/python/pep8.py
M tests/python/rna_info_dump.py
D vpaint.txt
D "\357\200\233OB\357\200\233OA"
D "\357\200\233OB\357\200\233OA.pub"
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66ee215864d..e7917278434 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
if(NOT DEFINED WITH_IN_SOURCE_BUILD)
message(FATAL_ERROR
"CMake generation for blender is not allowed within the source directory!"
- "\n Remove the CMakeCache.txt file and try again from another folder, e.g.:"
+ "\n Remove \"${CMAKE_SOURCE_DIR}/CMakeCache.txt\" and try again from another folder, e.g.:"
"\n "
"\n rm CMakeCache.txt"
"\n cd .."
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index b996c234c67..9e256a78a59 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -322,8 +322,8 @@ OPENEXR_FORCE_REBUILD=false
OPENEXR_SKIP=false
_with_built_openexr=false
-OIIO_VERSION="1.7.13"
-OIIO_VERSION_MIN="1.7.13"
+OIIO_VERSION="1.7.15"
+OIIO_VERSION_MIN="1.7.15"
OIIO_VERSION_MAX="1.9.0" # UNKNOWN currently # Not supported by current OSL...
OIIO_FORCE_BUILD=false
OIIO_FORCE_REBUILD=false
@@ -366,7 +366,7 @@ ALEMBIC_FORCE_BUILD=false
ALEMBIC_FORCE_REBUILD=false
ALEMBIC_SKIP=false
-OPENCOLLADA_VERSION="1.6.47"
+OPENCOLLADA_VERSION="1.6.51"
OPENCOLLADA_FORCE_BUILD=false
OPENCOLLADA_FORCE_REBUILD=false
OPENCOLLADA_SKIP=false
@@ -788,7 +788,7 @@ ALEMBIC_SOURCE=( "https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.
# ALEMBIC_SOURCE_REPO_BRANCH="master"
OPENCOLLADA_SOURCE=( "https://github.com/KhronosGroup/OpenCOLLADA.git" )
-OPENCOLLADA_REPO_UID="22b1f4ff026881b4d2804d397730286ab7e3d090"
+OPENCOLLADA_REPO_UID="0c2cdc17c22cf42050e4d42154bed2176363549c"
OPENCOLLADA_REPO_BRANCH="master"
FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
diff --git a/build_files/buildbot/config/blender_linux_player.cmake b/build_files/buildbot/config/blender_linux_player.cmake
index 2fb31192002..69ab984e386 100644
--- a/build_files/buildbot/config/blender_linux_player.cmake
+++ b/build_files/buildbot/config/blender_linux_player.cmake
@@ -1,4 +1,4 @@
-# This is applied as an ovveride on top of blender_linux.config
+# This is applied as an override on top of blender_linux.config
# Disables all the areas which are not needed for the player.
set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE)
set(WITH_CYCLES OFF CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake
index 1c10d5a71de..63bc520ea15 100644
--- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake
+++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake
@@ -83,6 +83,7 @@ FOREACH(COMPONENT ${_opencollada_FIND_INCLUDES})
# but this is less trouble, just looks strange.
include/opencollada/${COMPONENT}
include/${COMPONENT}/include
+ include/${COMPONENT}
HINTS
${_opencollada_SEARCH_DIRS}
)
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake b/build_files/cmake/platform/platform_win32_msvc.cmake
index 2055b164f6d..3b417f79cbe 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -452,20 +452,21 @@ if(WITH_MOD_CLOTH_ELTOPO)
endif()
if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
- set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
- set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
- set(OPENSUBDIV_LIBRARIES optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib
- optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib
- debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
- debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
- )
- set(OPENSUBDIV_HAS_OPENMP TRUE)
+ set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
+ set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
+ set(OPENSUBDIV_LIBRARIES
+ optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib
+ optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib
+ debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
+ debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
+ )
+ set(OPENSUBDIV_HAS_OPENMP TRUE)
set(OPENSUBDIV_HAS_TBB FALSE)
set(OPENSUBDIV_HAS_OPENCL TRUE)
set(OPENSUBDIV_HAS_CUDA FALSE)
set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE)
set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE)
- windows_find_package(OpenSubdiv)
+ windows_find_package(OpenSubdiv)
endif()
if(WITH_SDL)
@@ -488,14 +489,14 @@ endif()
# used in many places so include globally, like OpenGL
blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}")
-#find signtool
-SET(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( )
+#find signtool
+set(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( )
find_program(SIGNTOOL_EXE signtool
-HINTS
- "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/"
- "$ENV{ProgramFiles}/Windows Kits/10/bin/x86/"
- "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.1/bin/x86/"
- "$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86/"
- "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.0/bin/x86/"
- "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86/"
+ HINTS
+ "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/"
+ "$ENV{ProgramFiles}/Windows Kits/10/bin/x86/"
+ "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.1/bin/x86/"
+ "$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86/"
+ "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.0/bin/x86/"
+ "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86/"
)
diff --git a/doc/python_api/examples/bpy.app.translations.py b/doc/python_api/examples/bpy.app.translations.py
index e41623d2885..4256147ef31 100644
--- a/doc/python_api/examples/bpy.app.translations.py
+++ b/doc/python_api/examples/bpy.app.translations.py
@@ -32,3 +32,62 @@ Module References
-----------------
"""
+
+import bpy
+
+# This block can be automatically generated by UI translations addon, which also handles conversion with PO format.
+# See also https://wiki.blender.org/index.php/Dev:Doc/Process/Translate_Blender#Translating_non-official_addons
+# It can (should) also be put in a different, specific py file.
+
+# ##### BEGIN AUTOGENERATED I18N SECTION #####
+# NOTE: You can safely move around this auto-generated block (with the begin/end markers!),
+# and edit the translations by hand.
+# Just carefully respect the format of the tuple!
+
+# Tuple of tuples ((msgctxt, msgid), (sources, gen_comments), (lang, translation, (is_fuzzy, comments)), ...)
+translations_tuple = (
+ (("*", ""),
+ ((), ()),
+ ("fr_FR", "Project-Id-Version: Copy Settings 0.1.5 (r0)\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2013-04-18 15:27:45.563524\nPO-Revision-Date: 2013-04-18 15:38+0100\nLast-Translator: Bastien Montagne <montagne29 at wanadoo.fr>\nLanguage-Team: LANGUAGE <LL at li.org>\nLanguage: __POT__\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n",
+ (False,
+ ("Blender's translation file (po format).",
+ "Copyright (C) 2013 The Blender Foundation.",
+ "This file is distributed under the same license as the Blender package.",
+ "FIRST AUTHOR <EMAIL at ADDRESS>, YEAR."))),
+ ),
+ (("Operator", "Render: Copy Settings"),
+ (("bpy.types.SCENE_OT_render_copy_settings",),
+ ()),
+ ("fr_FR", "Rendu : copier réglages",
+ (False, ())),
+ ),
+ (("*", "Copy render settings from current scene to others"),
+ (("bpy.types.SCENE_OT_render_copy_settings",),
+ ()),
+ ("fr_FR", "Copier les réglages de rendu depuis la scène courante vers d’autres",
+ (False, ())),
+ ),
+ # ... etc, all messages from your addon.
+)
+
+translations_dict = {}
+for msg in translations_tuple:
+ key = msg[0]
+ for lang, trans, (is_fuzzy, comments) in msg[2:]:
+ if trans and not is_fuzzy:
+ translations_dict.setdefault(lang, {})[key] = trans
+
+# ##### END AUTOGENERATED I18N SECTION #####
+
+# Define remaining addon (operators, UI...) here.
+
+def register():
+ # Usual operator/UI/etc. registration...
+
+ bpy.app.translations.register(__name__, translations_dict)
+
+
+def unregister():
+ bpy.app.translations.unregister(__name__)
+
+ # Usual operator/UI/etc. unregistration...
diff --git a/doc/python_api/examples/bpy.types.Operator.5.py b/doc/python_api/examples/bpy.types.Operator.5.py
index 310eeceadf3..c1a49a756a0 100644
--- a/doc/python_api/examples/bpy.types.Operator.5.py
+++ b/doc/python_api/examples/bpy.types.Operator.5.py
@@ -2,13 +2,14 @@
Modal Execution
+++++++++++++++
-This operator defines a :class:`Operator.modal` function which running,
-handling events until it returns ``{'FINISHED'}`` or ``{'CANCELLED'}``.
-
-Grab, Rotate, Scale and Fly-Mode are examples of modal operators.
-They are especially useful for interactive tools,
-your operator can have its own state where keys toggle options as the operator
-runs.
+This operator defines a :class:`Operator.modal` function that will keep being
+run to handle events until it returns ``{'FINISHED'}`` or ``{'CANCELLED'}``.
+
+Modal operators run every time a new event is detected, such as a mouse click
+or key press. Conversely, when no new events are detected, the modal operator
+will not run. Modal operators are especially useful for interactive tools, an
+operator can have its own state where keys toggle options as the operator runs.
+Grab, Rotate, Scale, and Fly-Mode are examples of modal operators.
:class:`Operator.invoke` is used to initialize the operator as being by
returning ``{'RUNNING_MODAL'}``, initializing the modal loop.
diff --git a/doc/python_api/rst/bge.app.rst b/doc/python_api/rst/bge.app.rst
index 34b9263db0c..e8b91ffbcaf 100644
--- a/doc/python_api/rst/bge.app.rst
+++ b/doc/python_api/rst/bge.app.rst
@@ -47,4 +47,3 @@ Module to access application values that remain unchanged during runtime.
True if the BGE has been built with physics support.
:type: bool
-
diff --git a/doc/python_api/rst/gpu.rst b/doc/python_api/rst/gpu.rst
index 6c38122a573..cf639357a31 100644
--- a/doc/python_api/rst/gpu.rst
+++ b/doc/python_api/rst/gpu.rst
@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list