Update to RenderDoc 1.10

eliemichel · Oct 20, 2020 · dff7cf8 · dff7cf8
1 parent d4567a8
commit dff7cf8
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 3 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, 3, 2),
+    "version": (0, 3, 3),
     "blender": (2, 82, 0),
     "location": "File > Import > Google Maps Capture",
     "description": "Import meshes from a Google Maps or Google Earth capture",

diff --git a/blender/MapsModelsImporter/bin/win32/renderdoc.dll b/blender/MapsModelsImporter/bin/win32/renderdoc.dll
diff --git a/blender/MapsModelsImporter/bin/win32/renderdoc.pyd b/blender/MapsModelsImporter/bin/win32/renderdoc.pyd
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/google_maps_rd.py b/blender/MapsModelsImporter/google_maps_rd.py
@@ -75,6 +75,7 @@ def getVertexShaderConstants(self, draw, state=None):
                 ep,
                 cb.bindPoint,
                 cbuff.resourceId,
+                0,
                 0
             )
             for var in variables:
@@ -217,7 +218,7 @@ def run(self):
                 with open("{}{:05d}-uv.bin".format(FILEPREFIX, drawcallId), 'wb') as file:
                     pickle.dump(unpacked, file)
             except Exception as err:
-                print("(Skipping: {})".format(err))
+                print("(Skipping because of error: {})".format(err))
                 continue
 
             # Vertex Shader Constants

diff --git a/blender/MapsModelsImporter/meshdata.py b/blender/MapsModelsImporter/meshdata.py
@@ -44,7 +44,7 @@ def fmt2struct(fmt):
         rd.CompType.UScaled: uintfmt,
         rd.CompType.SNorm:   sintfmt,
         rd.CompType.SScaled: sintfmt,
-        rd.CompType.Double:  floatfmt,
+        #rd.CompType.Double:  floatfmt,
     }
     return str(fmt.compCount) + formatChars[fmt.compType][fmt.compByteWidth]