Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Sun, 8 Apr 2018 12:07:34 +0000 (14:07 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Sun, 8 Apr 2018 12:07:34 +0000 (14:07 +0200)
commita981206fd183355bdcc8331b3a74ce3d382e1f67
treeefa5534ed691645530707a80cf4a2039909f79b7
parent0b5ebb3265b155658d441135e152f32ba11c001d
parent245e01c30ac296c509e04f702c6b5d76086265b5
Merge branch 'master' into blender2.8
12 files changed:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/armature_update.c
source/blender/blenkernel/intern/image.c
source/blender/collada/AnimationImporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/editors/io/io_collada.c
source/blender/editors/render/render_internal.c
source/blender/editors/undo/memfile_undo.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/nodes/shader/nodes/node_shader_volume_principled.c
source/blender/windowmanager/intern/wm_window.c