Merge branch 'master' into hashremoval

2022-06-01 10:06:33 -07:00
parent 1e098496be 8939a3aa66
commit 998b9ba482
16 changed files with 123 additions and 77 deletions
@@ -183,8 +183,6 @@ private:

  ShaderCache* shader_cache_;

-  QVariant default_shader_;
-
 };

 }