Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 10 Oct 2018 22:08:30 +0000 (09:08 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 10 Oct 2018 22:08:30 +0000 (09:08 +1100)
commit66738d4aa017203caff067c41e25e28d62c3fd0b
treedee20ce0b0b6293812eeb76be279d9103297d60b
parent95f2604ea7b32d034cce7c7ec46149eaf6174d47
parent2083a7e274fefd4c82c8c52df87bc175e453c628
Merge branch 'master' into blender2.8
23 files changed:
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_exporter.h
source/blender/alembic/intern/abc_hair.cc
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/mesh.c
source/blender/collada/ArmatureExporter.cpp
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/ControllerExporter.cpp
source/blender/collada/GeometryExporter.cpp
source/blender/collada/GeometryExporter.h
source/blender/collada/collada_utils.cpp
source/blender/draw/intern/draw_manager.c
source/blender/draw/modes/overlay_mode.c
source/blender/editors/armature/armature_select.c
source/blender/editors/armature/pose_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/freestyle/intern/application/Controller.cpp
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access.c
source/blender/python/generic/py_capi_utils.h