[Bf-blender-cvs] [4195e4cc7e9] greasepencil-object: Fix for edit modes (sculpt, weight paint) menus not showing in header

[Dalai Felinto]

Commit: 4195e4cc7e9d9ccfcf84e352b1fb4b22830f3f5b
Author: Dalai Felinto
Date:   Fri May 12 15:46:00 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB4195e4cc7e9d9ccfcf84e352b1fb4b22830f3f5b

Fix for edit modes (sculpt, weight paint) menus not showing in header

But introduced on 2b0f02057f457acec1ed9444ee7d833ab26d0d33

===================================================================

M       source/blender/blenkernel/intern/context.c

===================================================================

diff --git a/source/blender/blenkernel/intern/context.c 
b/source/blender/blenkernel/intern/context.c
index 2d851364001..ae81e2ad1dd 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);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs