From 31a7286c1c635808410541400b2ded5176e3e71a Mon Sep 17 00:00:00 2001
From: Alexander Raistrick <araistrick@princeton.edu>
Date: Tue, 22 Oct 2024 11:35:28 -0400
Subject: [PATCH] Update Changelog for v1.11, fix formatting, fix submodules,
 add OpenEXR dependency

---
 docs/CHANGELOG.md                                    | 5 ++++-
 infinigen/__init__.py                                | 2 +-
 infinigen/datagen/customgt/dependencies/fast_obj     | 1 -
 infinigen/datagen/customgt/dependencies/indicators   | 1 -
 infinigen/datagen/customgt/dependencies/tinycolormap | 1 -
 infinigen/terrain/utils/mesh.py                      | 2 +-
 pyproject.toml                                       | 1 +
 7 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 160000 infinigen/datagen/customgt/dependencies/fast_obj
 delete mode 160000 infinigen/datagen/customgt/dependencies/indicators
 delete mode 160000 infinigen/datagen/customgt/dependencies/tinycolormap

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 99cb3d94..1986b71f 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -139,4 +139,7 @@ v1.10.0
 
 v1.10.1
 - Fix missing validity checks for camera-rig cameras which are not the 0th index
-- Fix missing seat in dining chair
\ No newline at end of file
+- Fix missing seat in dining chair
+
+v1.11.0
+- Update to Blender == 4.2.0
diff --git a/infinigen/__init__.py b/infinigen/__init__.py
index a2aabb54..f7218326 100644
--- a/infinigen/__init__.py
+++ b/infinigen/__init__.py
@@ -6,7 +6,7 @@
 import logging
 from pathlib import Path
 
-__version__ = "1.10.1"
+__version__ = "1.11.0"
 
 
 def repo_root():
diff --git a/infinigen/datagen/customgt/dependencies/fast_obj b/infinigen/datagen/customgt/dependencies/fast_obj
deleted file mode 160000
index 85778da5..00000000
--- a/infinigen/datagen/customgt/dependencies/fast_obj
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 85778da5fc320b7e52885f8e869edc079695cc79
diff --git a/infinigen/datagen/customgt/dependencies/indicators b/infinigen/datagen/customgt/dependencies/indicators
deleted file mode 160000
index a5bc05f3..00000000
--- a/infinigen/datagen/customgt/dependencies/indicators
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a5bc05f32a9c719535054b7fa5306ce5c8d055d8
diff --git a/infinigen/datagen/customgt/dependencies/tinycolormap b/infinigen/datagen/customgt/dependencies/tinycolormap
deleted file mode 160000
index 67198d2b..00000000
--- a/infinigen/datagen/customgt/dependencies/tinycolormap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 67198d2b2b48ca5e97600c83b5c0f2310cfd4c03
diff --git a/infinigen/terrain/utils/mesh.py b/infinigen/terrain/utils/mesh.py
index 972da1b9..0f73d464 100644
--- a/infinigen/terrain/utils/mesh.py
+++ b/infinigen/terrain/utils/mesh.py
@@ -12,11 +12,11 @@
 import trimesh
 from numpy import ascontiguousarray as AC
 
+from infinigen.core.nodes.node_wrangler import ng_inputs, ng_outputs
 from infinigen.core.util import blender as butil
 from infinigen.core.util.logging import Timer
 from infinigen.core.util.organization import Attributes
 
-from ...core.nodes.node_wrangler import ng_inputs, ng_outputs
 from .camera import getK
 from .ctype_util import ASDOUBLE, ASINT, load_cdll
 from .kernelizer_util import ATTRTYPE_DIMS, ATTRTYPE_FIELDS, NPTYPEDIM_ATTR, Vars
diff --git a/pyproject.toml b/pyproject.toml
index 0ad95e6e..33a43478 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,6 +39,7 @@ dependencies = [
     "submitit",
     "tqdm",
     "trimesh",
+    "OpenEXR",
 
     # used by trimesh, we could specify "trimesh[easy]" but this brings more packages
     "python-fcl",