From dc6fb43d0e9a8d3707a42343a915ba0c37b520b1 Mon Sep 17 00:00:00 2001
From: jonwd7 <jon.wd7@gmail.com>
Date: Tue, 30 May 2017 22:15:25 -0400
Subject: [PATCH] Rename SphereBV to NiBound

Renamed to NiBound to reflect the actual Gamebryo type.
---
 nif.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nif.xml b/nif.xml
index 86a4f60..b34ba84 100644
--- a/nif.xml
+++ b/nif.xml
@@ -1564,6 +1564,12 @@
         <add name="f5" type="float"></add>
     </compound>-->
 
+    <compound name="NiBound">
+        A sphere.
+        <add name="Center" type="Vector3">The sphere's center.</add>
+        <add name="Radius" type="float">The sphere's radius.</add>
+    </compound>
+
     <compound name="QTransform">
         <add name="Translation" type="Vector3">Translation.</add>
         <add name="Rotation" type="Quaternion">Rotation.</add>
@@ -1659,12 +1665,6 @@
         <add name="Vertex Weights" type="SkinWeight" arr1="Num Vertices" ver1="4.2.2.0" cond="ARG != 0">The vertex weights.</add>
     </compound>
 
-    <compound name="SphereBV">
-        A sphere.
-        <add name="Center" type="Vector3">The sphere's center.</add>
-        <add name="Radius" type="float">The sphere's radius.</add>
-    </compound>
-
     <compound name="HavokColFilter">
         ColFilter property for Havok. It contains Layer, Flags and Part Number
         <add name="Layer" type="OblivionLayer" default="STATIC" vercond="(Version != 20.2.0.7) || ((Version == 20.2.0.7) &amp;&amp; (User Version != 11) &amp;&amp; (User Version != 12) &amp;&amp; (User Version 2 != 34) &amp;&amp; (User Version 2 != 83))">Sets mesh color in Oblivion Construction Set.</add><!--condition: all except Fallout 3 and Skyrim -->
@@ -1956,7 +1956,7 @@
 
     <compound name="BoundingVolume">
         <add name="Collision Type" type="BoundVolumeType">Type of collision data.</add>
-        <add name="Sphere" type="SphereBV" cond="Collision Type == 0">Sphere</add>
+        <add name="Sphere" type="NiBound" cond="Collision Type == 0">Sphere</add>
         <add name="Box" type="BoxBV" cond="Collision Type == 1">Box</add>
         <add name="Capsule" type="CapsuleBV" cond="Collision Type == 2">Capsule</add>
         <add name="Union" type="UnionBV" cond="Collision Type == 4">Union</add>
@@ -2416,7 +2416,7 @@
         <add name="Unknown Float 1" type="float">Unknown.</add>
         <add name="Unknown Float 2" type="float">Unknown.</add>
         <add name="Num Spheres" type="uint">The number of spheres in this multi sphere shape.</add>
-        <add name="Spheres" type="SphereBV" arr1="Num Spheres">This array holds the spheres which make up the multi sphere shape.</add>
+        <add name="Spheres" type="NiBound" arr1="Num Spheres">This array holds the spheres which make up the multi sphere shape.</add>
     </niobject>
 
     <niobject name="bhkBvTreeShape" abstract="1" inherit="bhkShape">
@@ -5913,7 +5913,7 @@
 
         <add name="Num Submeshes" type="ushort">The number of submeshes contained in this mesh.</add>
         <add name="Instancing Enabled" type="bool">Sets whether hardware instancing is being used.</add>
-        <add name="Bound" type="SphereBV">The combined bounding volume of all submeshes.</add>
+        <add name="Bound" type="NiBound">The combined bounding volume of all submeshes.</add>
         <add name="Num Datas" type="uint" />
         <add name="Datas" type="MeshData" arr1="Num Datas" />
         <add name="Num Modifiers" type="uint" />
@@ -5977,7 +5977,7 @@
         <add name="Num Bones" type="uint">The number of bones referenced by this mesh modifier.</add>
         <add name="Bones" type="Ptr" template="NiAVObject" arr1="Num Bones">Pointers to the bone nodes that affect this skin.</add>
         <add name="Bone Transforms" type="SkinTransform" arr1="Num Bones">The transforms that go from bind-pose space to bone space.</add><!-- Skin To Bone Transforms -->
-        <add name="Bone Bounds" type="SphereBV" cond="(Flags &amp; 2)!=0" arr1="Num Bones">The bounds of the bones.  Only stored if the RECOMPUTE_BOUNDS bit is set.</add> <!-- Note, "SphereBV" is actually "NiBound."-->
+        <add name="Bone Bounds" type="NiBound" cond="(Flags &amp; 2)!=0" arr1="Num Bones">The bounds of the bones.  Only stored if the RECOMPUTE_BOUNDS bit is set.</add>
     </niobject>
 
     <niobject name="NiInstancingMeshModifier" inherit="NiMeshModifier">
@@ -6529,7 +6529,7 @@
     
     <niobject name="BSTriShape" abstract="0" inherit="NiAVObject">
         Fallout 4 Tri Shape
-        <add name="Bounding Sphere" type="SphereBV" />
+        <add name="Bounding Sphere" type="NiBound" />
         <add name="Skin" type="Ref" template="NiObject" />
         <add name="BS Properties" type="Ref" template="NiProperty" arr1="2" />
         <add name="Vertex Size" type="byte" />
@@ -6642,7 +6642,7 @@
 
     <compound name="BSSkinBoneTrans">
         Fallout 4 Bone Transform
-        <add name="Bounding Sphere" type="SphereBV" />
+        <add name="Bounding Sphere" type="NiBound" />
         <add name="Rotation" type="Matrix33" />
         <add name="Translation" type="Vector3" />
         <add name="Scale" type="float" />
@@ -6702,7 +6702,7 @@
         <add name="Rotation" type="Matrix33" />
         <add name="Translation" type="Vector3" />
         <add name="Scale" type="float" />
-        <add name="Bounding Sphere" type="SphereBV" />
+        <add name="Bounding Sphere" type="NiBound" />
     </compound>
     
     <compound name="BSPackedGeomDataLOD">
-- 
GitLab