[Bf-blender-cvs] [95185f6e7e0] universal-scene-description: USD IO: fixed includes.

Michael Kowalski noreply at git.blender.org
Wed Aug 31 01:43:06 CEST 2022


Commit: 95185f6e7e0d14406515dc22146f2b8dfea54421
Author: Michael Kowalski
Date:   Tue Aug 30 19:41:37 2022 -0400
Branches: universal-scene-description
https://developer.blender.org/rB95185f6e7e0d14406515dc22146f2b8dfea54421

USD IO: fixed includes.

Fixed include order to fix build error.
Also removed unneeded includes.

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

M	source/blender/io/usd/intern/usd_skel_convert.cc

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

diff --git a/source/blender/io/usd/intern/usd_skel_convert.cc b/source/blender/io/usd/intern/usd_skel_convert.cc
index 833e2ee9c5a..f05c0ffc2dc 100644
--- a/source/blender/io/usd/intern/usd_skel_convert.cc
+++ b/source/blender/io/usd/intern/usd_skel_convert.cc
@@ -26,9 +26,18 @@
 #include <pxr/usd/usdSkel/bindingAPI.h>
 #include <pxr/usd/usdSkel/utils.h>
 
+#include "DNA_anim_types.h"
+#include "DNA_armature_types.h"
+#include "DNA_key_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_meta_types.h"
+#include "DNA_scene_types.h"
+
 #include "BKE_action.h"
 #include "BKE_armature.h"
 #include "BKE_deform.h"
+#include "BKE_fcurve.h"
 #include "BKE_key.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.h"
@@ -39,24 +48,7 @@
 
 #include "BLI_math_vector.h"
 
-#include "DNA_armature_types.h"
-#include "DNA_key_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_meta_types.h"
-#include "DNA_scene_types.h"
-
-#include "BKE_main.h"
-#include "BKE_scene.h"
-#include "BLI_listbase.h"
-#include "BLI_math.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-#include "DNA_scene_types.h"
-
-#include "BKE_fcurve.h"
 #include "ED_keyframing.h"
-
 #include "ED_mesh.h"
 
 #include <string>



More information about the Bf-blender-cvs mailing list