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:
authorDalai Felinto <dfelinto@gmail.com>2017-05-12 16:46:00 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-05-12 16:46:54 +0300
commit24168f72c3abd0057fdbd43b8e769a4764982211 (patch)
tree7216d65230083a525ab1a443dde68dfbac5b5340 /source/blender/blenkernel/intern/context.c
parent18a96e39ea9318d7cca1d4d0bfc19ad81a6dff34 (diff)
Fix for edit modes (sculpt, weight paint) menus not showing in header
But introduced on 2b0f02057f457acec1ed9444ee7d833ab26d0d33
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 6ca9b1dab04..3c2f641fb42 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -992,7 +992,7 @@ int CTX_data_mode_enum_ex(const Object *obedit, const Object *ob)
int CTX_data_mode_enum(const bContext *C)
{
Object *obedit = CTX_data_edit_object(C);
- Object *obact = obedit ? CTX_data_active_object(C) : NULL;
+ Object *obact = obedit ? NULL : CTX_data_active_object(C);
return CTX_data_mode_enum_ex(obedit, obact);
}