merge from master
authorGaia Clary <gaia.clary@machinimatrix.org>
Mon, 26 Feb 2018 21:49:30 +0000 (22:49 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Mon, 26 Feb 2018 21:49:30 +0000 (22:49 +0100)
commitf228a08d027ef700344d35f1ba958249afa93222
treefc6c60d89f911bcb0c5019e2e6e4243e49cba9af
parente94276d4033c72000942a49100e552e800d09e58
parent7dd0e36dc4582e57a3f5235f384b5207882c923e
merge from master
18 files changed:
source/blender/blenkernel/intern/particle_distribute.c
source/blender/collada/AnimationExporter.cpp
source/blender/collada/AnimationExporter.h
source/blender/collada/ControllerExporter.cpp
source/blender/collada/DocumentExporter.cpp
source/blender/collada/ExportSettings.h
source/blender/collada/SceneExporter.cpp
source/blender/collada/SceneExporter.h
source/blender/collada/collada.cpp
source/blender/collada/collada.h
source/blender/collada/collada_utils.cpp
source/blender/collada/collada_utils.h
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/io/io_collada.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesrna/intern/rna_scene_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c