diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-07 19:13:06 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-07 19:17:40 +0400 |
| commit | 6eb20ca048e65871f12e8111512b69bacc599488 (patch) | |
| tree | 759349e5e5960f8cbea47bc55cec6a81379c9cc4 /source/blender/blenkernel/intern/context.c | |
| parent | 163a3212b471b4fe75a15600299e11a22d88a752 (diff) | |
Fix own broken rB95b25e7333c4 (crash on any undo op :/).
Issue here was that buttons_texture_context_compute() was getting scene from (button-customized) context,
before the button paths (and hence, context) had been updated. So after an undo, it was getting an invalid
(freed by undo) scene pointer.
Now update BCONTEXT_SCENE path before calling buttons_texture_context_compute().
Diffstat (limited to 'source/blender/blenkernel/intern/context.c')
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 9dc62421349..eeb1f4b9e4f 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -873,7 +873,7 @@ Scene *CTX_data_scene(const bContext *C) { Scene *scene; - if (ctx_data_pointer_verify(C, "scene", (void *)&scene) && scene) + if (ctx_data_pointer_verify(C, "scene", (void *)&scene)) return scene; else return C->data.scene; |