diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 19:33:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 19:33:44 +0400 |
| commit | c6391e8d2394b8d022b03f48941b235b96d677d0 (patch) | |
| tree | cdc9bff57e2b0a7cdc33f22677f2f6d505a21bc1 /source/blender/editors/space_buttons | |
| parent | b2c7dd2d5cb2cda7c1a43018f5f61602b0908c78 (diff) | |
| parent | 36fa74b50e2d24ef9f99fbff4cc2d393da37361e (diff) | |
svn merge ^/trunk/blender -r42053:42069
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index 4446a2e848a..c0ccaeaea90 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -257,8 +257,8 @@ void buttons_texture_context_compute(const bContext *C, SpaceButs *sbuts) if(!scene_use_new_shading_nodes(scene)) { if(ct) { - MEM_freeN(ct); BLI_freelistN(&ct->users); + MEM_freeN(ct); sbuts->texuser= NULL; } |