Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 Feb 2018 14:06:41 +0000 (01:06 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 Feb 2018 14:06:41 +0000 (01:06 +1100)
commitb330804ff3eca68cdd65e26d551d1829fae5ff36
tree7501de6265ae963e064a580e6339539740a9008b
parent9e2ec6c86a9ea2e387fe5e523df06c0a462819b7
parent9fb1f9c5cdccc14f65ba2047e5656b360142aa43
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_curves.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_preview.c
source/blender/nodes/shader/nodes/node_shader_tex_environment.c
source/blender/nodes/shader/nodes/node_shader_tex_image.c
tests/python/CMakeLists.txt