Browse Source

Bugfix: Fix builtin meshes fail to load after restart

BearishSun 6 years ago
parent
commit
51d3353876
4 changed files with 26 additions and 17 deletions
  1. 1 1
      CMakeLists.txt
  2. 1 1
      Data/.reqversion
  3. 23 14
      Data/Raw/DataList.json
  4. 1 1
      Source/bsf

+ 1 - 1
CMakeLists.txt

@@ -34,7 +34,7 @@ add_subdirectory(${BSF_SOURCE_DIR})
 
 set (BS_PREBUILT_DEPENDENCIES_VERSION 24)
 set (BS_SRC_DEPENDENCIES_VERSION 15)
-set (BS_BUILTIN_ASSETS_VERSION 16)
+set (BS_BUILTIN_ASSETS_VERSION 17)
 
 # Options
 set(SCRIPT_BINDING_GENERATION OFF CACHE BOOL "If true, script binding generation will be supported through a specialized build target. Enable this if you plan on modifying the scripting API. Requires the SBGen tool dependency.")

+ 1 - 1
Data/.reqversion

@@ -1 +1 @@
-9
+10

+ 23 - 14
Data/Raw/DataList.json

@@ -1,4 +1,17 @@
 {
+    "AnimatedSprites": [
+        {
+            "Animation": {
+                "Count": 29,
+                "FPS": 29,
+                "NumColumns": 10,
+                "NumRows": 3
+            },
+            "Path": "Spinner.png",
+            "SpriteUUID": "f3e4fdfa-e5bd-4a00-9619-293e9b196413",
+            "TextureUUID": "c5ad224b-5294-49b3-9a54-d18f6b9d34fa"
+        }
+    ],
     "Cursors": null,
     "Fonts": [
         {
@@ -138,20 +151,6 @@
             "UUID": "b6a27d2f-793a-4b02-906a-e0c987ec3b80"
         }
     ],
-	"AnimatedSprites": [
-        {
-            "Path": "Spinner.png",
-            "SpriteUUID": "f3e4fdfa-e5bd-4a00-9619-293e9b196413",
-            "TextureUUID": "c5ad224b-5294-49b3-9a54-d18f6b9d34fa",
-			"Animation":
-			{
-				"NumRows": 3,
-				"NumColumns": 10,
-				"Count": 29,
-				"FPS": 29
-			}
-        }
-	],
     "Skin": [
         {
             "Path": "ButtonActive.png",
@@ -1658,6 +1657,16 @@
             "Path": "SceneCameraOptionsIconOn.png",
             "SpriteUUID": "bc2d60d6-4a4b-eef9-8c87-4a4baad3c2c7",
             "TextureUUID": "b41fb04a-44f2-e17e-b697-44f20a42b34d"
+        },
+        {
+            "Path": "AnimPropertyIcon.png",
+            "SpriteUUID": "82810d60-4853-21ee-7f84-48538849c49b",
+            "TextureUUID": "18214dcb-4385-b33c-3f88-438529bc5a93"
+        },
+        {
+            "Path": "AnimPropertyIconOn.png",
+            "SpriteUUID": "286b300e-4f7e-eb27-32b5-4f7e46839e96",
+            "TextureUUID": "2294df02-43c2-6df5-4598-43c23a1653cb"
         }
     ],
     "SpriteIcons3D": [

+ 1 - 1
Source/bsf

@@ -1 +1 @@
-Subproject commit a072722267017fa0eaaab1ed2b15d53395ae2b1e
+Subproject commit 353a183169c1382b7c65a18af78f684877b852b2