Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 7 Sep 2018 20:21:30 +0000 (06:21 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 7 Sep 2018 20:21:52 +0000 (06:21 +1000)
commitb000492c4f8eded8da5e502741cccc7def1ecb52
tree7bd1e1f54b0f7141edccaae0a68e9fe3580ae7b3
parenta91c856f0ced4db76445fa6c0560ad598c71c276
parentecc140b225c25a727a582bbe5dea001678497ed0
Merge branch 'master' into blender2.8
14 files changed:
add_dimension.py
io_directx_bel/__init__.py
io_import_BrushSet.py
io_import_sound_to_anim.py
io_points_pcd/__init__.py
io_scene_cod/import_xmodel.py
io_scene_map/__init__.py
mesh_ktools.py
mesh_xoffsets.py
np_station/utils_graphics.py
object_particle_hair_lab.py
oscurart_mesh_thread.py
space_view3d_enhanced_3d_cursor.py
space_view3d_toolshelf_menu.py