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:
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image_2d.c')
-rw-r--r--source/blender/editors/sculpt_paint/paint_image_2d.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c
index d614c800350..78dc5fea2ce 100644
--- a/source/blender/editors/sculpt_paint/paint_image_2d.c
+++ b/source/blender/editors/sculpt_paint/paint_image_2d.c
@@ -1037,7 +1037,7 @@ static float paint_2d_ibuf_add_if(
paint_2d_ibuf_rgb_get(ibuf, x, y, inrgb);
}
else {
- return 0;
+ return 0.0f;
}
mul_v4_fl(inrgb, w);
@@ -1690,7 +1690,7 @@ void *paint_2d_new_stroke(bContext *C, wmOperator *op, int mode)
if (BKE_image_has_packedfile(s->image) && s->image->rr != NULL) {
BKE_report(op->reports, RPT_WARNING, "Packed MultiLayer files cannot be painted");
MEM_freeN(s);
- return 0;
+ return NULL;
}
s->num_tiles = BLI_listbase_count(&s->image->tiles);