diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-19 05:42:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-19 05:46:32 +0300 |
commit | 48ad55a03d658e73ae90166e752f5cf81292c8c1 (patch) | |
tree | 768f4b6ec43abb64c62586fd034194d17a477eea /source/blender/blenkernel | |
parent | d731ee4960cf78f7b461be0c8f5ef27c098da265 (diff) |
Cleanup: use enum for CTX_data_mode_enum
Exposes errors in some cases when compared against incompatible values.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_context.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/context.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index cf573232bac..e9ca3c51a5f 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -254,10 +254,10 @@ struct RenderEngineType *CTX_data_engine_type(const bContext *C); struct ToolSettings *CTX_data_tool_settings(const bContext *C); const char *CTX_data_mode_string(const bContext *C); -int CTX_data_mode_enum_ex( +enum eContextObjectMode CTX_data_mode_enum_ex( const struct Object *obedit, const struct Object *ob, const eObjectMode object_mode); -int CTX_data_mode_enum(const bContext *C); +enum eContextObjectMode CTX_data_mode_enum(const bContext *C); void CTX_data_main_set(bContext *C, struct Main *bmain); void CTX_data_scene_set(bContext *C, struct Scene *bmain); diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index a8e0cbed707..a16656253d3 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -975,7 +975,7 @@ Collection *CTX_data_collection(const bContext *C) return BKE_collection_master(scene); } -int CTX_data_mode_enum_ex(const Object *obedit, const Object *ob, const eObjectMode object_mode) +enum eContextObjectMode CTX_data_mode_enum_ex(const Object *obedit, const Object *ob, const eObjectMode object_mode) { // Object *obedit = CTX_data_edit_object(C); if (obedit) { @@ -1015,7 +1015,7 @@ int CTX_data_mode_enum_ex(const Object *obedit, const Object *ob, const eObjectM return CTX_MODE_OBJECT; } -int CTX_data_mode_enum(const bContext *C) +enum eContextObjectMode CTX_data_mode_enum(const bContext *C) { Object *obedit = CTX_data_edit_object(C); Object *obact = obedit ? NULL : CTX_data_active_object(C); |