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:
authorCampbell Barton <ideasman42@gmail.com>2012-09-13 03:19:08 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-13 03:19:08 +0400
commitf66d11cf7770fdfe5e473630d4964ecacaaa0348 (patch)
tree410f3683f81f78740cf54766d982d4d093bb8ae5 /source/blender/editors/object/object_bake.c
parent0a0074f9c65255dfa7b5bca67abe149b7d74e797 (diff)
fix for missing NULL check in own recent commit, thanks Gaia for pointing this out.
Diffstat (limited to 'source/blender/editors/object/object_bake.c')
-rw-r--r--source/blender/editors/object/object_bake.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index c0dd911946b..f9b73a56403 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -1377,9 +1377,11 @@ static void finish_bake_internal(BakeRender *bkr)
}
/* freed when baking is done, but if its canceled we need to free here */
- if (ibuf->userdata) {
- MEM_freeN(ibuf->userdata);
- ibuf->userdata = NULL;
+ if (ibuf) {
+ if (ibuf->userdata) {
+ MEM_freeN(ibuf->userdata);
+ ibuf->userdata = NULL;
+ }
}
}
}