Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 15 Feb 2018 14:17:43 +0000 (01:17 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 15 Feb 2018 14:17:43 +0000 (01:17 +1100)
commitca5fdd857b7864b0336aca655f2c04d00090c0f9
tree5e19a8ec6a5c08ba9d6e8cf1f98cd7d9980a5f23
parentdf1c88b652e6977491b7f2b019c326518ccdc320
parent2aef87bfae4a6a91f626780767aab68b7791c9d4
Merge branch 'master' into blender2.8
22 files changed:
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/softbody.c
source/blender/editors/object/object_bake.c
source/blender/editors/render/render_internal.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/sculpt_undo.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/intern/gpu_draw.c
source/blender/imbuf/intern/thumbs.c
source/blender/nodes/shader/node_shader_tree.c
source/blender/nodes/texture/node_texture_tree.c
source/blender/render/intern/source/bake.c
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/external_engine.c
source/blender/render/intern/source/multires_bake.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/creator/creator_args.c