diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-02 17:45:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-02 17:45:10 +0300 |
| commit | 2b0f02057f457acec1ed9444ee7d833ab26d0d33 (patch) | |
| tree | 8950524c178e5464423568cedb1b9b8fb74a2130 /source/blender/blenkernel | |
| parent | 47239b40419750f0ad8284ba1de1012a638660fb (diff) | |
Draw Manager: split DRW_draw_view into 2 functions
Needed for offscreen render
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_context.h | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 14 |
2 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index 22368104566..c911d9ec952 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -250,6 +250,7 @@ struct SceneLayer *CTX_data_scene_layer(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(const struct Object *obedit, const struct Object *ob); int CTX_data_mode_enum(const bContext *C); void CTX_data_main_set(bContext *C, struct Main *bmain); diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 20a3d4ac7e0..6ca9b1dab04 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -953,10 +953,9 @@ SceneCollection *CTX_data_scene_collection(const bContext *C) return BKE_collection_master(scene); } -int CTX_data_mode_enum(const bContext *C) +int CTX_data_mode_enum_ex(const Object *obedit, const Object *ob) { - Object *obedit = CTX_data_edit_object(C); - + // Object *obedit = CTX_data_edit_object(C); if (obedit) { switch (obedit->type) { case OB_MESH: @@ -976,8 +975,7 @@ int CTX_data_mode_enum(const bContext *C) } } else { - Object *ob = CTX_data_active_object(C); - + // Object *ob = CTX_data_active_object(C); if (ob) { if (ob->mode & OB_MODE_POSE) return CTX_MODE_POSE; else if (ob->mode & OB_MODE_SCULPT) return CTX_MODE_SCULPT; @@ -991,6 +989,12 @@ int CTX_data_mode_enum(const bContext *C) return CTX_MODE_OBJECT; } +int CTX_data_mode_enum(const bContext *C) +{ + Object *obedit = CTX_data_edit_object(C); + Object *obact = obedit ? CTX_data_active_object(C) : NULL; + return CTX_data_mode_enum_ex(obedit, obact); +} /* would prefer if we can use the enum version below over this one - Campbell */ /* must be aligned with above enum */ |