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:
authorBastien Montagne <montagne29@wanadoo.fr>2014-04-07 14:23:24 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-04-07 14:23:24 +0400
commit95b25e7333c4ac9077812b06cfa203ffcbab26a5 (patch)
tree26216e5faaa16e006b59d261fe8576c177487864 /source/blender/blenkernel/intern/context.c
parent8714ae09f89426242ecd0c65f3291de1a2b51fc4 (diff)
Fix T39562: Properties panel Pinning is broken
'scene' was simply not handled in button context.
Diffstat (limited to 'source/blender/blenkernel/intern/context.c')
-rw-r--r--source/blender/blenkernel/intern/context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index eeb1f4b9e4f..9dc62421349 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))
+ if (ctx_data_pointer_verify(C, "scene", (void *)&scene) && scene)
return scene;
else
return C->data.scene;