Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 16 Jan 2018 03:56:03 +0000 (14:56 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 16 Jan 2018 03:56:03 +0000 (14:56 +1100)
12 files changed:
1  2 
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/collada/AnimationImporter.cpp
source/blender/editors/interface/interface_handlers.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/python/intern/bpy_rna.c
source/blender/render/intern/source/convertblender.c

Simple merge