Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 10 Mar 2018 05:55:39 +0000 (06:55 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 10 Mar 2018 05:55:39 +0000 (06:55 +0100)
commitd27158aae9bc48b2a07760a2dbe8e642fcecbe57
tree7ecfe898e53f07e589ee4be0ea5b297153d7dfcf
parentf3161bd2abe4bcc41f0e9169275be315ecc6b054
parent8a76f8dac3475b1d24956e0d384d65295f15c76a
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_curves.cpp
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/blender/blender_util.h
release/scripts/startup/bl_ui/space_userpref.py
source/blender/editors/armature/pose_lib.c
source/blender/gpu/shaders/gpu_shader_material.glsl
tests/python/CMakeLists.txt