[Bf-blender-cvs] [24168f72c3a] blender2.8: Fix for edit modes (sculpt, weight paint) menus not showing in header

Dalai Felinto noreply at git.blender.org
Fri May 12 15:46:59 CEST 2017


Commit: 24168f72c3abd0057fdbd43b8e769a4764982211
Author: Dalai Felinto
Date:   Fri May 12 15:46:00 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB24168f72c3abd0057fdbd43b8e769a4764982211

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 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);
 }




More information about the Bf-blender-cvs mailing list