diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-04-07 22:10:48 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-04-07 22:10:48 +0300 |
| commit | da24848fb45695365aaf79e577ee241a97188eb5 (patch) | |
| tree | edff089e4839982488680adacd21fcb3234f28ff /source/blender | |
| parent | 7a75581d92ad1df005f1da23a84a3d0aea20188e (diff) | |
OpenGL: remove UI_reinit_gl_state function
All line & point drawing is responsible for setting its own state (as of January 2016) making this redundant.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 1 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_draw.c | 12 | ||||
| -rw-r--r-- | source/blender/editors/space_api/spacetypes.c | 1 |
3 files changed, 0 insertions, 14 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index c0b457be918..75c28331c4b 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -793,7 +793,6 @@ void UI_popup_handlers_remove_all(struct bContext *C, struct ListBase *handlers) void UI_init(void); void UI_init_userdef(void); void UI_reinit_font(void); -void UI_reinit_gl_state(void); void UI_exit(void); /* Layout diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 5e4cb9c1ba1..3162584e910 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -2011,15 +2011,3 @@ void ui_draw_dropshadow(const rctf *rct, float radius, float aspect, float alpha glDisable(GL_BLEND); } - -/** - * Reset GL state (keep minimal). - * - * \note Blender's internal code doesn't assume these are reset, - * but external callbacks may depend on their state. - */ -void UI_reinit_gl_state(void) -{ - glLineWidth(1.0f); - glPointSize(1.0f); -} diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index 5ff1d758563..4d601a31251 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -256,7 +256,6 @@ void ED_region_draw_cb_draw(const bContext *C, ARegion *ar, int type) for (rdc = ar->type->drawcalls.first; rdc; rdc = rdc->next) { if (rdc->type == type) { - UI_reinit_gl_state(); rdc->draw(C, ar, rdc->customdata); } } |