diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-02-06 04:48:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-06 04:48:17 +0400 |
| commit | f40dc450543bd3a812332a6d45bcf0b0a63a8f62 (patch) | |
| tree | 5b598c4a656b5ea711beac213a52274958ac6769 /source/blender/render | |
| parent | b64858cade5b604b88df23d47b2c25f6e992da47 (diff) | |
fix [#34125] Crash when bake margin = 0
regression since 2.65, just missing NULL check.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/bake.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c index 665361e7d14..f304ca517ad 100644 --- a/source/blender/render/intern/source/bake.c +++ b/source/blender/render/intern/source/bake.c @@ -1072,12 +1072,14 @@ int RE_bake_shade_all_selected(Render *re, int type, Object *actob, short *do_up if (!ibuf) continue; - userdata = (BakeImBufuserData *) ibuf->userdata; - RE_bake_ibuf_filter(ibuf, userdata->mask_buffer, re->r.bake_filter); + if (userdata) { + userdata = (BakeImBufuserData *) ibuf->userdata; + RE_bake_ibuf_filter(ibuf, userdata->mask_buffer, re->r.bake_filter); - if (use_displacement_buffer) { - RE_bake_ibuf_normalize_displacement(ibuf, userdata->displacement_buffer, userdata->mask_buffer, - displacement_min, displacement_max); + if (use_displacement_buffer) { + RE_bake_ibuf_normalize_displacement(ibuf, userdata->displacement_buffer, userdata->mask_buffer, + displacement_min, displacement_max); + } } ibuf->userflags |= IB_BITMAPDIRTY; |