diff options
| -rw-r--r-- | source/blender/editors/space_action/action_data.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_result.c | 23 |
2 files changed, 5 insertions, 20 deletions
diff --git a/source/blender/editors/space_action/action_data.c b/source/blender/editors/space_action/action_data.c index a7358172ef5..440201bd93e 100644 --- a/source/blender/editors/space_action/action_data.c +++ b/source/blender/editors/space_action/action_data.c @@ -646,7 +646,7 @@ static NlaTrack *nla_tweak_track_get(AnimData *adt) printf("%s: Active strip (%p, %s) not in NLA track found (%p, %s)\n", __func__, adt->actstrip, (adt->actstrip) ? adt->actstrip->name : "<None>", - nlt, (nlt) ? nlt->name : "<None>"); + nlt, nlt->name); } } } diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 90f6eab0cc1..9ae394fa675 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -1512,10 +1512,7 @@ void render_result_rect_from_ibuf(RenderResult *rr, RenderData *UNUSED(rd), ImBu /* TSK! Since sequence render doesn't free the *rr render result, the old rect32 * can hang around when sequence render has rendered a 32 bits one before */ - if (rv->rect32) { - MEM_freeN(rv->rect32); - rv->rect32 = NULL; - } + MEM_SAFE_FREE(rv->rect32); } else if (ibuf->rect) { if (!rv->rect32) @@ -1524,24 +1521,12 @@ void render_result_rect_from_ibuf(RenderResult *rr, RenderData *UNUSED(rd), ImBu memcpy(rv->rect32, ibuf->rect, 4 * rr->rectx * rr->recty); /* Same things as above, old rectf can hang around from previous render. */ - if (rv->rectf) { - MEM_freeN(rv->rectf); - rv->rectf = NULL; - } + MEM_SAFE_FREE(rv->rectf); } /* clean up non-view buffers */ - if (rr) { - if (rr->rectf) { - MEM_freeN(rr->rectf); - rr->rectf = NULL; - } - - if (rr->rect32) { - MEM_freeN(rr->rect32); - rr->rect32 = NULL; - } - } + MEM_SAFE_FREE(rr->rect32); + MEM_SAFE_FREE(rr->rectf); } void render_result_rect_fill_zero(RenderResult *rr, const int view_id) |