Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 1 Aug 2017 00:38:36 +0000 (10:38 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 1 Aug 2017 00:38:36 +0000 (10:38 +1000)
commit8ddaa6a4e237cfa667ace4a00f147e2683d83840
tree96c6e1b8ca4051317b42a3b77269c61c45af8f66
parentb71366801e45dafd7fb8c658edeaf88dfb4cb84e
parenta372638a76e05aaa44589845680c15a7f09a7f1e
Merge branch 'master' into blender2.8
33 files changed:
source/blender/blenkernel/intern/object_dupli.c
source/blender/editors/animation/keyframing.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/interface/interface.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/editors/transform/transform_conversions.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/modifiers/intern/MOD_build.c
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_curve.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_edgesplit.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_fluidsim.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/modifiers/intern/MOD_multires.c
source/blender/modifiers/intern/MOD_ocean.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/modifiers/intern/MOD_skin.c
source/blender/modifiers/intern/MOD_smoke.c
source/blender/modifiers/intern/MOD_triangulate.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/windowmanager/intern/wm_operators.c