Merge branch 'master' into 28
authorCampbell Barton <ideasman42@gmail.com>
Fri, 21 Apr 2017 07:14:13 +0000 (17:14 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 21 Apr 2017 07:14:13 +0000 (17:14 +1000)
commit2b9738b7f814a7c5cae02d283d0958a2a0284cb5
treec3902e3a9d865c983630229b98cd14c0275c6763
parentc4780ee45927b25d6bb186261b3fab75c7214471
parent13ee5ba467d69b80f025d0d2542ed190ad1667db
Merge branch 'master' into 28
source/blender/blenkernel/intern/pointcache.c
source/blender/editors/include/ED_image.h
source/blender/editors/include/ED_node.h
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/modifiers/intern/MOD_surfacedeform.c