Commit: d1fbcbe16744fa68a1531c5476646e1dec260de1 Author: Michael A. Kowalski Date: Thu Oct 15 19:44:21 2020 -0400 Branches: usd-importer-T81257 https://developer.blender.org/rBd1fbcbe16744fa68a1531c5476646e1dec260de1
Format fixes. =================================================================== M source/blender/blenkernel/BKE_editmesh_bvh.h M source/blender/io/usd/intern/usd_capi.cc =================================================================== diff --git a/source/blender/blenkernel/BKE_editmesh_bvh.h b/source/blender/blenkernel/BKE_editmesh_bvh.h index 8c800ea9529..69d1b4819f8 100644 --- a/source/blender/blenkernel/BKE_editmesh_bvh.h +++ b/source/blender/blenkernel/BKE_editmesh_bvh.h @@ -91,7 +91,7 @@ struct BVHTreeOverlap *BKE_bmbvh_overlap(const BMBVHTree *bmtree_a, unsigned int *r_overlap_tot); struct BVHTreeOverlap *BKE_bmbvh_overlap_self(const BMBVHTree *bmtree, - unsigned int *r_overlap_tot); + unsigned int *r_overlap_tot); /** #BKE_bmbvh_new flag parameter. */ enum { diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc index 40a9bbce162..212e0014c3f 100644 --- a/source/blender/io/usd/intern/usd_capi.cc +++ b/source/blender/io/usd/intern/usd_capi.cc @@ -17,9 +17,9 @@ * All rights reserved. */ +#include "import/usd_import_util.h" #include "import/usd_importer_context.h" #include "import/usd_reader_object.h" -#include "import/usd_import_util.h" #include "usd.h" #include "usd_hierarchy_iterator.h" _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs