[Bf-blender-cvs] [d436d67fcc4] master: Cleanup: proper use of UNUSED_VARS_NDEBUG instead of random hack.

Bastien Montagne noreply at git.blender.org
Fri Aug 16 16:26:01 CEST 2019


Commit: d436d67fcc47b877da3844b5b1a441c5e6574c82
Author: Bastien Montagne
Date:   Fri Aug 16 16:18:48 2019 +0200
Branches: master
https://developer.blender.org/rBd436d67fcc47b877da3844b5b1a441c5e6574c82

Cleanup: proper use of UNUSED_VARS_NDEBUG instead of random hack.

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

M	source/blender/makesrna/intern/rna_collection.c

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

diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c
index 691803e0de1..4700df5352f 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -130,9 +130,9 @@ static bool rna_Collection_objects_override_apply(Main *bmain,
                                                   PointerRNA *UNUSED(ptr_item_storage),
                                                   IDOverrideLibraryPropertyOperation *opop)
 {
-  (void)opop;
   BLI_assert(opop->operation == IDOVERRIDE_LIBRARY_OP_REPLACE &&
              "Unsupported RNA override operation on collections' objects");
+  UNUSED_VARS_NDEBUG(opop);
 
   Collection *coll_dst = ptr_dst->id.data;
 
@@ -233,9 +233,9 @@ static bool rna_Collection_children_override_apply(Main *bmain,
                                                    PointerRNA *UNUSED(ptr_item_storage),
                                                    IDOverrideLibraryPropertyOperation *opop)
 {
-  (void)opop;
   BLI_assert(opop->operation == IDOVERRIDE_LIBRARY_OP_REPLACE &&
              "Unsupported RNA override operation on collections' objects");
+  UNUSED_VARS_NDEBUG(opop);
 
   Collection *coll_dst = ptr_dst->id.data;



More information about the Bf-blender-cvs mailing list