[Bf-blender-cvs] [57e3575e57e] usd-importer-T81257-merge: Organize USD and Alembic conditional includes.

[makowalski]

Commit: 57e3575e57ea7ee0525224eda2cecaa59f0e6aab
Author: makowalski
Date:   Tue Jun 22 11:09:04 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB57e3575e57ea7ee0525224eda2cecaa59f0e6aab

Organize USD and Alembic conditional includes.

Grouped common USD and Alembic mesh sequence cache code includes.

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

M	source/blender/modifiers/intern/MOD_meshsequencecache.c

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

diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index 1638806ef66..f8cfb4a35cf 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -60,16 +60,16 @@
 
 #include "MEM_guardedalloc.h"
 
-#ifdef WITH_ALEMBIC
-#  include "ABC_alembic.h"
+#if defined(WITH_USD) || defined(WITH_ALEMBIC)
 #  include "BKE_global.h"
 #  include "BKE_lib_id.h"
 #endif
 
+#ifdef WITH_ALEMBIC
+#  include "ABC_alembic.h"
+#endif
+
 #ifdef WITH_USD
-#  include "BKE_global.h"
-#  include "BKE_lib_id.h"
-#  include "BKE_library.h"
 #  include "usd.h"
 #endif