[Bf-blender-cvs] [258d3858572] master: Cleanup: Unused variable, compiler warning

Hans Goudey noreply at git.blender.org
Mon Sep 5 19:02:44 CEST 2022


Commit: 258d3858572b588051814363abe42044eeec3182
Author: Hans Goudey
Date:   Mon Sep 5 12:02:21 2022 -0500
Branches: master
https://developer.blender.org/rB258d3858572b588051814363abe42044eeec3182

Cleanup: Unused variable, compiler warning

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

M	source/blender/blenkernel/BKE_collection.h
M	source/blender/blenkernel/intern/collection.c

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

diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index 4a729311b6a..4346c2a3d23 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -26,6 +26,7 @@ struct BlendExpander;
 struct BlendLibReader;
 struct BlendWriter;
 struct Collection;
+struct ID;
 struct Library;
 struct Main;
 struct Object;
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 572a0caa3c7..e0448afdec6 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -186,6 +186,8 @@ static ID *collection_owner_get(Main *bmain, ID *id, ID *UNUSED(owner_id_hint))
     }
   }
   BLI_assert(is_owner_found);
+#else
+  UNUSED_VARS(bmain);
 #endif
 
   return master_collection->owner_id;



More information about the Bf-blender-cvs mailing list