Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 24 Nov 2018 21:01:30 +0000 (08:01 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 24 Nov 2018 21:01:53 +0000 (08:01 +1100)
commit059c119719e04283808d3c7076886e1a58874f6b
tree5296776b81111ef62e33687d4a9b4c6ab5e297ff
parentfa0fcbe4d6ca3f183f02395fe9ba18fb5ea87748
parente742e0934de6384eeaf271ca4cfe99922ddbe3fb
Merge branch 'master' into blender2.8
18 files changed:
intern/cycles/render/scene.cpp
intern/ghost/intern/GHOST_SystemX11.cpp
source/blender/blenkernel/intern/main.c
source/blender/blenkernel/intern/object.c
source/blender/collada/AnimationCurveCache.cpp
source/blender/collada/AnimationCurveCache.h
source/blender/collada/AnimationExporter.cpp
source/blender/collada/AnimationExporter.h
source/blender/collada/BCAnimationCurve.cpp
source/blender/collada/BCAnimationSampler.cpp
source/blender/collada/BCAnimationSampler.h
source/blender/collada/BCSampleData.cpp
source/blender/collada/ErrorHandler.cpp
source/blender/collada/SceneExporter.cpp
source/blender/collada/collada_utils.cpp
source/blender/collada/collada_utils.h
source/blender/draw/intern/draw_cache_impl_metaball.c
source/blender/editors/io/io_collada.c