Update for RD 1.25

eliemichel · Feb 2, 2023 · 8cf3df1 · 8cf3df1
1 parent 9618bbc
commit 8cf3df1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/blender/MapsModelsImporter/__init__.py b/blender/MapsModelsImporter/__init__.py
@@ -24,7 +24,7 @@
 bl_info = {
     "name": "Maps Models Importer",
     "author": "Elie Michel",
-    "version": (0, 5, 0),
+    "version": (0, 6, 0),
     "blender": (3, 1, 0),
     "location": "File > Import > Google Maps Capture",
     "description": "Import meshes from a Google Maps or Google Earth capture",

diff --git a/blender/MapsModelsImporter/bin/win64/renderdoc.dll b/blender/MapsModelsImporter/bin/win64/renderdoc.dll
diff --git a/blender/MapsModelsImporter/bin/win64/renderdoc.pyd b/blender/MapsModelsImporter/bin/win64/renderdoc.pyd
diff --git a/blender/MapsModelsImporter/rdutils.py b/blender/MapsModelsImporter/rdutils.py
@@ -32,8 +32,8 @@ def __enter__(self):
         self.cap = rd.OpenCaptureFile()
         status = self.cap.OpenFile(self.filename, '', None)
 
-        if status != rd.ReplayStatus.Succeeded:
-            print("Couldn't open file: " + str(status))
+        if not status.OK():
+            print("Couldn't open file: " + status.Message())
             self.err = True
             return None
 
@@ -42,18 +42,22 @@ def __enter__(self):
             self.err = True
             return None
 
-        status,self.controller = self.cap.OpenCapture(rd.ReplayOptions(), None)
+        status, self.controller = self.cap.OpenCapture(rd.ReplayOptions(), None)
 
-        if status != rd.ReplayStatus.Succeeded:
-            print("Couldn't initialise replay: " + str(status))
-            if status == 15:
+        if not status.OK():
+            print("Couldn't initialise replay: " + status.Message())
+            if status.code == 15:
                 print("This is likely due to an unsupported version of RenderDoc.")
             self.cap.Shutdown()
             self.err = True
             return None
+
+        # Once the replay is created, the CaptureFile can be shut down, there
+        # is no dependency on it by the ReplayController.
+        self.cap.Shutdown()
+
         return self.controller
 
     def __exit__(self, type, value, traceback):
         if not self.err:
             self.controller.Shutdown()
-            self.cap.Shutdown()