Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 19 Sep 2018 02:14:36 +0000 (12:14 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 19 Sep 2018 02:14:36 +0000 (12:14 +1000)
commitf35e9f047a0381732a41ec331945b7a0654ee578
tree5be3c632483cf2bc2960b21789849af27c9b2b59
parent0ad183bf0289c3b9b1af0cd581bc30435cae3800
parentbb3ec3ebafbc2c0e5d8530148a433242e0adad30
Merge branch 'master' into blender2.8
64 files changed:
source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c
source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/mesh_convert.c
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/mesh_merge.c
source/blender/blenkernel/intern/mesh_remap.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/object_deform.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pbvh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/intern/freetypefont.c
source/blender/blenloader/intern/versioning_260.c
source/blender/bmesh/tools/bmesh_bevel.c
source/blender/bmesh/tools/bmesh_intersect.c
source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
source/blender/draw/engines/workbench/workbench_deferred.c
source/blender/draw/engines/workbench/workbench_forward.c
source/blender/draw/intern/draw_cache_impl_mesh.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/armature/pose_edit.c
source/blender/editors/armature/pose_select.c
source/blender/editors/gpencil/gpencil_brush.c
source/blender/editors/gpencil/gpencil_data.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_node/node_templates.c
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/editors/transform/transform_snap.c
source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/makesdna/intern/dna_genfile.c
source/blender/modifiers/intern/MOD_build.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/modifiers/intern/MOD_weighted_normal.c
source/blender/python/bmesh/bmesh_py_types.c
source/blender/python/bmesh/bmesh_py_types_customdata.c
source/blender/python/bmesh/bmesh_py_types_meshdata.c
source/blender/python/intern/bpy_app.c
source/blender/python/intern/bpy_app_handlers.c
source/blender/python/mathutils/mathutils_Quaternion.c
source/blender/python/mathutils/mathutils_Vector.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_window.c
source/creator/creator_args.c