Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2018 06:05:38 +0000 (08:05 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2018 06:05:38 +0000 (08:05 +0200)
commit9bd0c63382bf226c271c40d5a5967c22c75718ea
tree97ad1061c10f39498459d54da34caddd59d39fbd
parentbe983295ea14af226b3c824a035ccee9d416c67f
parentaf36dd4664ddf35c7ad99f05f9878ce1acf787bd
Merge branch 'master' into blender2.8
147 files changed:
intern/ghost/GHOST_IContext.h
intern/ghost/GHOST_ISystem.h
intern/ghost/intern/GHOST_SystemCocoa.h
intern/ghost/intern/GHOST_SystemX11.h
release/scripts/modules/keyingsets_utils.py
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/BLI_math_matrix.h
source/blender/collada/GeometryExporter.cpp
source/blender/collada/SceneExporter.cpp
source/blender/collada/collada_internal.cpp
source/blender/draw/engines/eevee/shaders/ltc_lib.glsl
source/blender/draw/engines/workbench/shaders/workbench_forward_depth_frag.glsl
source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl
source/blender/draw/engines/workbench/solid_mode.c
source/blender/draw/engines/workbench/transparent_mode.c
source/blender/draw/engines/workbench/workbench_effect_fxaa.c
source/blender/draw/intern/draw_anim_viz.c
source/blender/draw/modes/overlay_mode.c
source/blender/draw/modes/shaders/common_fxaa_lib.glsl
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/armature/armature_intern.h
source/blender/editors/armature/armature_naming.c
source/blender/editors/armature/armature_ops.c
source/blender/editors/armature/armature_relations.c
source/blender/editors/armature/meshlaplacian.h
source/blender/editors/armature/pose_select.c
source/blender/editors/include/BIF_gl.h
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/ED_fileselect.h
source/blender/editors/include/ED_image.h
source/blender/editors/include/ED_node.h
source/blender/editors/include/ED_particle.h
source/blender/editors/include/ED_undo.h
source/blender/editors/include/ED_util.h
source/blender/editors/include/ED_uvedit.h
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/interface/interface_style.c
source/blender/editors/interface/view2d.c
source/blender/editors/interface/view2d_ops.c
source/blender/editors/manipulator_library/manipulator_library_intern.h
source/blender/editors/manipulator_library/manipulator_library_presets.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/object/object_constraint.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_shapekey.c
source/blender/editors/physics/particle_boids.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/physics/physics_ops.c
source/blender/editors/physics/physics_pointcache.c
source/blender/editors/render/render_intern.h
source/blender/editors/render/render_ops.c
source/blender/editors/render/render_preview.c
source/blender/editors/render/render_shading.c
source/blender/editors/render/render_update.c
source/blender/editors/render/render_view.c
source/blender/editors/screen/screen_context.c
source/blender/editors/screen/screendump.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_action/action_intern.h
source/blender/editors/space_buttons/buttons_intern.h
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_clip/tracking_ops_stabilize.c
source/blender/editors/space_file/file_panels.c
source/blender/editors/space_file/space_file.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_edit.c
source/blender/editors/space_image/image_intern.h
source/blender/editors/space_node/node_add.c
source/blender/editors/space_node/node_templates.c
source/blender/editors/space_outliner/outliner_ops.c
source/blender/editors/space_outliner/space_outliner.c
source/blender/editors/space_script/space_script.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_intern.h
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/editors/space_text/space_text.c
source/blender/editors/space_text/text_header.c
source/blender/editors/space_userpref/space_userpref.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_manipulator_forcefield.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_ops.c
source/blender/editors/uvedit/uvedit_buttons.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_basic_shader.h
source/blender/gpu/GPU_draw.h
source/blender/gpu/intern/gpu_codegen.h
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_shader_private.h
source/blender/gpu/shaders/gpu_shader_basic_frag.glsl
source/blender/gpu/shaders/gpu_shader_basic_vert.glsl
source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl
source/blender/gpu/shaders/gpu_shader_vertex_world.glsl
source/blender/ikplugin/intern/ikplugin_api.c
source/blender/ikplugin/intern/iksolver_plugin.c
source/blender/ikplugin/intern/itasc_plugin.cpp
source/blender/makesrna/RNA_define.h
source/blender/makesrna/intern/rna_context.c
source/blender/makesrna/intern/rna_image_api.c
source/blender/makesrna/intern/rna_lightprobe.c
source/blender/makesrna/intern/rna_screen.c
source/blender/makesrna/intern/rna_speaker.c
source/blender/makesrna/intern/rna_ui.c
source/blender/nodes/NOD_shader.h
source/blender/nodes/shader/node_shader_util.c
source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
source/blender/nodes/shader/nodes/node_shader_attribute.c
source/blender/nodes/shader/nodes/node_shader_light_falloff.c
source/blender/nodes/shader/nodes/node_shader_object_info.c
source/blender/nodes/shader/nodes/node_shader_particle_info.c
source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
source/blender/nodes/shader/nodes/node_shader_volume_principled.c
source/blender/nodes/shader/nodes/node_shader_volume_scatter.c
source/blender/python/bmesh/bmesh_py_types_meshdata.c
source/blender/python/intern/bpy_manipulator_wrap.c
source/blender/python/intern/bpy_manipulator_wrap.h
source/blender/python/intern/bpy_msgbus.c
source/blender/python/intern/gpu.c
source/blender/python/simple_enum_gen.py
source/blender/render/extern/include/RE_engine.h
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/initrender.h
source/blender/render/intern/include/render_result.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/include/renderpipeline.h
source/blender/render/intern/include/texture.h
source/blender/render/intern/include/zbuf.h
source/blender/render/intern/source/initrender.c
source/blender/render/intern/source/pointdensity.c
source/blender/render/intern/source/render_texture.c
source/blender/windowmanager/WM_keymap.h
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_draw.c
source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
source/blender/windowmanager/wm_draw.h
source/blender/windowmanager/wm_event_types.h
source/blender/windowmanager/wm_files.h
source/blender/windowmanager/wm_window.h
tests/python/modules/render_report.py