Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-02 15:40:00 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-02 15:40:00 +0300
commit5659d8bc0aa334aee20f29548e048f3002f1cff6 (patch)
tree924286c8a2cac613491de5fabb6208192960f58a /source/blender/blenkernel/intern/paint.c
parent23fe6e7eab3a728f1d1c6df2cef97ad02c222d37 (diff)
parent522bee3fc838c83b377d0e05fef8299a29ae5a16 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
-rw-r--r--source/blender/blenkernel/intern/paint.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 4056a15fe47..a63777dd5ad 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -214,7 +214,8 @@ Paint *BKE_paint_get_active_from_context(const bContext *C)
}
}
else {
- return BKE_paint_get_active(sce, view_layer);
+ /* default to image paint */
+ return &ts->imapaint.paint;
}
}