From cda89813dfc2261cd65822d26df8061a3097c85e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 17 Dec 2013 13:19:54 +1100 Subject: Fix for possible NULL pointer use in brush image sampling --- source/blender/blenkernel/intern/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 8a59aab4036..f8fa549fcd9 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -644,7 +644,7 @@ float BKE_brush_sample_tex_3D(const Scene *scene, Brush *br, if (br->mtex.tex->type == TEX_IMAGE && br->mtex.tex->ima) { ImBuf *tex_ibuf = BKE_image_pool_acquire_ibuf(br->mtex.tex->ima, &br->mtex.tex->iuser, pool); /* For consistency, sampling always returns color in linear space */ - if (tex_ibuf->rect_float == NULL) { + if (tex_ibuf && tex_ibuf->rect_float == NULL) { IMB_colormanagement_colorspace_to_scene_linear_v3(rgba, tex_ibuf->rect_colorspace); } BKE_image_pool_release_ibuf(br->mtex.tex->ima, tex_ibuf, pool); -- cgit v1.2.3