Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 24 Jan 2018 23:31:37 +0000 (10:31 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 24 Jan 2018 23:31:37 +0000 (10:31 +1100)
commit032129ef3527424de241f381376a3b94a2247965
treec767ec40502ab920ac823bba936c8b7f3cb8e75b
parentca088a7b126be3e08025b83d6ac6aafa7519985c
parent9b32248894d133c6437174e1470dfefa23a10b87
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_library.h
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/space_image/image_ops.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c