Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 2 May 2018 12:40:00 +0000 (14:40 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 2 May 2018 12:40:00 +0000 (14:40 +0200)
1  2 
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/paint.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/object/object_transform.c
source/blender/editors/physics/particle_object.c
source/blender/editors/transform/transform_snap_object.c
source/blender/modifiers/intern/MOD_surface.c
source/blender/modifiers/intern/MOD_surfacedeform.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/render/intern/source/bake_api.c

index 4056a15fe47edce1eef2d9cb827e8f269cc40d9c,144ec029db1e3741940da11d7e23e05259bd371b..a63777dd5ad465c3576063dbef24942d81340cc7
@@@ -214,7 -209,7 +214,8 @@@ Paint *BKE_paint_get_active_from_contex
                        }
                }
                else {
-                       return BKE_paint_get_active(sce, view_layer);
 -                      return BKE_paint_get_active(sce);
++                      /* default to image paint */
++                      return &ts->imapaint.paint;
                }
        }