archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Revert "BGL: Workaround broken bgl usage caused by GPU refactor"

Browse Source 
This reverts commit f12b0373f3.
This commit is contained in:
Clément Foucault
2020-10-08 17:58:38 +02:00
parent 479dc766b5
commit f23bf4cb10
7 changed files with 10 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/gpu/opengl/gl_state.cc
View File

@@ -73,17 +73,13 @@ GLStateManager::GLStateManager(void) : StateManager()
void GLStateManager::apply_state(void)
{
if (!this->use_bgl) {
this->set_state(this->state);
this->set_mutable_state(this->mutable_state);
this->texture_bind_apply();
this->image_bind_apply();
}
/* This is needed by gpu_py_offscreen. */
this->set_state(this->state);
this->set_mutable_state(this->mutable_state);
this->texture_bind_apply();
this->image_bind_apply();
active_fb->apply_state();
};
/* Will set all the states regardless of the current ones. */
void GLStateManager::force_state(void)
{
/* Little exception for clip distances since they need to keep the old count correct. */