[Bf-blender-cvs] [9d4fd257353] master: Fix T62460: undo doesn't work in files that have a paint curve.

[Brecht Van Lommel]

Commit: 9d4fd2573531ea841ed0940b3babbe76da2e6d02
Author: Brecht Van Lommel
Date:   Thu Mar 14 18:58:37 2019 +0100
Branches: master
https://developer.blender.org/rB9d4fd2573531ea841ed0940b3babbe76da2e6d02

Fix T62460: undo doesn't work in files that have a paint curve.

===================================================================

M	source/blender/editors/sculpt_paint/paint_curve_undo.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_curve_undo.c b/source/blender/editors/sculpt_paint/paint_curve_undo.c
index fb2f4b49f19..1eaed8eabb8 100644
--- a/source/blender/editors/sculpt_paint/paint_curve_undo.c
+++ b/source/blender/editors/sculpt_paint/paint_curve_undo.c
@@ -84,6 +84,9 @@ typedef struct PaintCurveUndoStep {
 
 static bool paintcurve_undosys_poll(bContext *C)
 {
+	if (C == NULL || !paint_curve_poll(C)) {
+		return false;
+	}
 	Paint *p = BKE_paint_get_active_from_context(C);
 	return (p->brush && p->brush->paint_curve);
 }
@@ -96,6 +99,9 @@ static void paintcurve_undosys_step_encode_init(struct bContext *C, UndoStep *us
 
 static bool paintcurve_undosys_step_encode(struct bContext *C, struct Main *UNUSED(bmain), UndoStep *us_p)
 {
+	if (C == NULL || !paint_curve_poll(C)) {
+		return false;
+	}
 	Paint *p = BKE_paint_get_active_from_context(C);
 	PaintCurve *pc = p ? (p->brush ? p->brush->paint_curve : NULL) : NULL;
 	if (pc == NULL) {