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>2022-11-03 21:40:30 +0300
committerClément Foucault <foucault.clem@gmail.com>2022-11-03 21:41:36 +0300
commit9dfc134c9d842245a2d8425728690f28a96e4511 (patch)
treeab6347161025d7a12084738d70fb81e45325c22f /source/blender/draw/intern/draw_command.cc
parentc2a99cb0b63dfb73ea83f941a5dbec0a8bab4bb5 (diff)
DRW: Fix incorrect logic in state redundancy check
Error introduced by rB3c39a3affee7.
Diffstat (limited to 'source/blender/draw/intern/draw_command.cc')
-rw-r--r--source/blender/draw/intern/draw_command.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_command.cc b/source/blender/draw/intern/draw_command.cc
index 88a53ddb54b..6e999815e8d 100644
--- a/source/blender/draw/intern/draw_command.cc
+++ b/source/blender/draw/intern/draw_command.cc
@@ -166,8 +166,10 @@ void StateSet::execute(RecordingState &recording_state) const
*/
BLI_assert(DST.state_lock == 0);
- if (!assign_if_different(recording_state.pipeline_state, new_state) &&
- !assign_if_different(recording_state.clip_plane_count, clip_plane_count)) {
+ bool state_changed = assign_if_different(recording_state.pipeline_state, new_state);
+ bool clip_changed = assign_if_different(recording_state.clip_plane_count, clip_plane_count);
+
+ if (!state_changed && !clip_changed) {
return;
}