Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 19 Sep 2018 16:19:49 +0000 (18:19 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 19 Sep 2018 16:20:50 +0000 (18:20 +0200)
commit6b433f4eb3da0acf092fb4e5417b10f9b304d073
tree17d66beede9df8d8b43f9db39265649c2d72e732
parenta7d43eb1c6e1679d4bdf15a9f558f2dbf0fb5b24
parenta4f2ebc78da4e10e65e864a16d2e621c7c79103d
Merge branch 'master' into blender2.8
69 files changed:
build_files/build_environment/install_deps.sh
build_files/cmake/config/blender_full.cmake
build_files/cmake/config/blender_headless.cmake
build_files/cmake/config/blender_release.cmake
build_files/cmake/config/bpy_module.cmake
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_apple.cmake
build_files/cmake/platform/platform_unix.cmake
doc/python_api/rst/info_api_reference.rst
release/scripts/startup/bl_operators/object_randomize_transform.py
release/scripts/startup/bl_operators/uvcalc_smart_project.py
release/scripts/startup/bl_ui/properties_object.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/draw/engines/basic/basic_engine.c
source/blender/draw/engines/eevee/eevee_depth_of_field.c
source/blender/draw/engines/eevee/eevee_effects.c
source/blender/draw/engines/eevee/eevee_engine.c
source/blender/draw/engines/eevee/eevee_lightcache.c
source/blender/draw/engines/eevee/eevee_lightprobes.c
source/blender/draw/engines/eevee/eevee_lights.c
source/blender/draw/engines/eevee/eevee_materials.c
source/blender/draw/engines/eevee/eevee_motion_blur.c
source/blender/draw/engines/eevee/eevee_private.h
source/blender/draw/engines/eevee/eevee_screen_raytrace.c
source/blender/draw/engines/eevee/eevee_volumes.c
source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
source/blender/draw/engines/eevee/shaders/lamps_lib.glsl
source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl
source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl
source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl
source/blender/draw/engines/gpencil/gpencil_engine.c
source/blender/draw/engines/gpencil/gpencil_engine.h
source/blender/draw/engines/workbench/workbench_deferred.c
source/blender/draw/engines/workbench/workbench_forward.c
source/blender/draw/intern/draw_armature.c
source/blender/draw/intern/draw_cache_impl_mesh.c
source/blender/draw/intern/draw_cache_impl_particles.c
source/blender/draw/intern/draw_common.h
source/blender/draw/intern/draw_hair.c
source/blender/draw/intern/draw_instance_data.c
source/blender/draw/intern/draw_manager.c
source/blender/draw/intern/draw_manager.h
source/blender/draw/intern/draw_manager_data.c
source/blender/draw/intern/draw_manager_exec.c
source/blender/draw/modes/edit_curve_mode.c
source/blender/draw/modes/edit_lattice_mode.c
source/blender/draw/modes/edit_surface_mode.c
source/blender/draw/modes/edit_text_mode.c
source/blender/draw/modes/overlay_mode.c
source/blender/draw/modes/paint_texture_mode.c
source/blender/draw/modes/sculpt_mode.c
source/blender/draw/modes/shaders/armature_axes_vert.glsl
source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl
source/blender/draw/modes/shaders/armature_envelope_solid_vert.glsl
source/blender/draw/modes/shaders/armature_shape_outline_vert.glsl
source/blender/draw/modes/shaders/armature_shape_solid_vert.glsl
source/blender/draw/modes/shaders/armature_sphere_outline_vert.glsl
source/blender/draw/modes/shaders/armature_sphere_solid_vert.glsl
source/blender/draw/modes/shaders/armature_stick_vert.glsl
source/blender/draw/modes/shaders/common_hair_lib.glsl
source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl
source/blender/draw/modes/shaders/object_empty_axes_vert.glsl
source/blender/draw/modes/shaders/object_empty_image_vert.glsl
source/blender/draw/modes/shaders/object_grid_frag.glsl
source/blender/draw/modes/shaders/object_mball_handles_vert.glsl
source/blender/draw/modes/shaders/object_outline_prepass_geom.glsl
source/blender/python/bmesh/bmesh_py_types.c
source/blender/python/intern/bpy_rna.c