diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-11-09 19:46:53 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-11-09 19:46:53 +0400 |
| commit | 1b4a54ad73c058baa59ffdc9e5f18b0b79030fb0 (patch) | |
| tree | a5b84d392ea14b0d760a5e24f7a8e51f203d558c /source/blender/editors/space_buttons/space_buttons.c | |
| parent | edec46b0a6aac18f406991b9e16228d4bd848c61 (diff) | |
| parent | bc5ec4e69cf3308c2563239c0e8372b853800a78 (diff) | |
Merge with trunk r41701soc-2011-carrot
Diffstat (limited to 'source/blender/editors/space_buttons/space_buttons.c')
| -rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 4c328d174e9..0c326af406f 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -104,6 +104,12 @@ static void buttons_free(SpaceLink *sl) if(sbuts->path) MEM_freeN(sbuts->path); + + if(sbuts->texuser) { + ButsContextTexture *ct= sbuts->texuser; + BLI_freelistN(&ct->users); + MEM_freeN(ct); + } } /* spacetype; init callback */ @@ -127,6 +133,7 @@ static SpaceLink *buttons_duplicate(SpaceLink *sl) /* clear or remove stuff from old */ sbutsn->ri= NULL; sbutsn->path= NULL; + sbutsn->texuser= NULL; return (SpaceLink *)sbutsn; } |