Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 Mar 2018 07:39:51 +0000 (18:39 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 Mar 2018 07:39:51 +0000 (18:39 +1100)
commit028580fd1ed38efb85bef35053685e3e8e69ad9b
treed5844e1ade291a64dba82d620f0c17f2c80fef2c
parentce08d0681baa1fc5fa5322d4ebf9d3fa97499c84
parent3106f18176f49a3b388e8e1f587d46d232a4a35e
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_object.cpp
source/blender/blenkernel/BKE_object.h
source/blender/editors/include/ED_uvedit.h
source/blender/editors/uvedit/uvedit_ops.c
tests/python/CMakeLists.txt