[Bf-blender-cvs] [c0c840cc310] master: Cleanup: prefer UNUSED_VARS_NDEBUG for debug only variables

Campbell Barton noreply at git.blender.org
Tue Mar 8 04:34:11 CET 2022


Commit: c0c840cc3109577476c70ae58ed918dea26b2640
Author: Campbell Barton
Date:   Tue Mar 8 14:15:34 2022 +1100
Branches: master
https://developer.blender.org/rBc0c840cc3109577476c70ae58ed918dea26b2640

Cleanup: prefer UNUSED_VARS_NDEBUG for debug only variables

Otherwise it's possible to accidentally use these variables
in debug builds, breaking release builds.

===================================================================

M	source/blender/editors/uvedit/uvedit_select.c

===================================================================

diff --git a/source/blender/editors/uvedit/uvedit_select.c b/source/blender/editors/uvedit/uvedit_select.c
index e574dc0620c..adf78ec6e96 100644
--- a/source/blender/editors/uvedit/uvedit_select.c
+++ b/source/blender/editors/uvedit/uvedit_select.c
@@ -1266,12 +1266,11 @@ void ED_uvedit_selectmode_flush(Scene *scene, BMEditMesh *em)
  * For face selections with sticky mode enabled, this can create invalid selection states. */
 void uvedit_select_flush(Scene *scene, BMEditMesh *em)
 {
+  ToolSettings *ts = scene->toolsettings;
   const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 
-#ifndef NDEBUG
-  ToolSettings *ts = scene->toolsettings;
   BLI_assert((ts->uv_flag & UV_SYNC_SELECTION) == 0);
-#endif
+  UNUSED_VARS_NDEBUG(ts);
 
   BMFace *efa;
   BMLoop *l;



More information about the Bf-blender-cvs mailing list