Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-10-08 18:58:38 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-10-08 18:58:38 +0300
commitf23bf4cb109cb8f39f873c4f80acbec3f33b098c (patch)
tree99e084e178236efd4458481b3ab4ab737a567835 /source/blender/gpu/opengl/gl_state.cc
parent479dc766b5f9eee29fe86b869ee0fa9edb95e5fc (diff)
Revert "BGL: Workaround broken bgl usage caused by GPU refactor"
This reverts commit f12b0373f322b710b9fa5cebb67bdf363ff90e9f.
Diffstat (limited to 'source/blender/gpu/opengl/gl_state.cc')
-rw-r--r--source/blender/gpu/opengl/gl_state.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/gpu/opengl/gl_state.cc b/source/blender/gpu/opengl/gl_state.cc
index 27c9b501add..cd24fa0e0e4 100644
--- a/source/blender/gpu/opengl/gl_state.cc
+++ b/source/blender/gpu/opengl/gl_state.cc
@@ -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. */