[Bf-blender-cvs] [cda8981] master: Fix for possible NULL pointer use in brush image sampling
Campbell Barton
noreply at git.blender.org
Tue Dec 17 03:24:06 CET 2013
Commit: cda89813dfc2261cd65822d26df8061a3097c85e
Author: Campbell Barton
Date: Tue Dec 17 13:19:54 2013 +1100
http://developer.blender.org/rBcda89813dfc2261cd65822d26df8061a3097c85e
Fix for possible NULL pointer use in brush image sampling
===================================================================
M source/blender/blenkernel/intern/brush.c
===================================================================
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 8a59aab..f8fa549 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);
More information about the Bf-blender-cvs
mailing list