Default paint context will be image paint if object is not in a paint mode. It solves not being able to tweak textures in the new texture context button system if an image editor is set up for painting and active object is in object mode.

1 files changed, 4 insertions, 0 deletions

diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 8218f474620..0dbe4c56a09 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -189,6 +189,8 @@ Paint *BKE_paint_get_active_from_context(const bContext *C)
 						return &ts->uvsculpt->paint;
 					else
 						return &ts->imapaint.paint;
+				default:
+					return &ts->imapaint.paint;
 			}
 		}
 		else {
@@ -238,6 +240,8 @@ PaintMode BKE_paintmode_get_active_from_context(const bContext *C)
 						return PAINT_SCULPT_UV;
 					else
 						return PAINT_TEXTURE_2D;
+				default:
+					return PAINT_TEXTURE_2D;
 			}
 		}
 		else {