Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / sculpt_paint / paint_utils.c
index e36cc275ba93974deb348d07b3d391e987a31c1c..21756fc435d5a9b2e27b3f42e0394ab907d5b83d 100644 (file)
@@ -420,7 +420,7 @@ void paint_sample_color(bContext *C, ARegion *ar, int x, int y, bool texpaint_pr
        Scene *scene = CTX_data_scene(C);
        Paint *paint = BKE_paint_get_active_from_context(C);
        Palette *palette = BKE_paint_palette(paint);
-       PaletteColor *color;
+       PaletteColor *color = NULL;
        Brush *br = BKE_paint_brush(BKE_paint_get_active_from_context(C));
        unsigned int col;
        const unsigned char *cp;