Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 20 May 2017 04:19:05 +0000 (14:19 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 20 May 2017 04:19:05 +0000 (14:19 +1000)
commit65aab6cdae822822122f5e180baf10e39f600bf2
treefc8556ec5590a0e47c41e2c18131fede4b67732b
parent996bf65730257d0a80c6ada03a38d0a321b1e87e
parent81e584ed17902878579131776b4e5a9f7b54cdab
Merge branch 'master' into blender2.8
24 files changed:
CMakeLists.txt
source/blender/blenkernel/intern/mball_tessellate.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/animation/anim_draw.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/armature/reeb.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_text/space_text.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/transform/transform_orientations.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/gpu/intern/gpu_debug.c
source/blender/render/intern/source/convertblender.c