From 44fc5768afb802aa9e8cde44c59a3658f8d93319 Mon Sep 17 00:00:00 2001
From: Andrej730 <azhilenkov@gmail.com>
Date: Mon, 22 Jul 2024 14:06:51 +0500
Subject: [PATCH] blender 4.2 - fix errors detecting last commit hash

1) __file__ / bim no longer exists as 'bim' is moved to the wheel
2) there also was an issue detecting hash after it was moved from bim to blenderbim package in c0635af
---
 src/blenderbim/blenderbim/__init__.py     | 3 +--
 src/blenderbim/blenderbim/bim/__init__.py | 1 -
 src/blenderbim/blenderbim/tool/blender.py | 3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/blenderbim/blenderbim/__init__.py b/src/blenderbim/blenderbim/__init__.py
index 5bfbbc2ec0..166590c6bb 100644
--- a/src/blenderbim/blenderbim/__init__.py
+++ b/src/blenderbim/blenderbim/__init__.py
@@ -147,8 +147,7 @@ if IN_BLENDER:
 
         # We can't just use __file__ as blenderbim/__init__.py is typically not symlinked
         # as Blender have errors symlinking main addon package file.
-        path = Path(__file__).parent / "bim" / "__init__.py"
-        path = path.resolve().parent
+        path = Path(__file__).resolve().parent
         repo = git.Repo(str(path), search_parent_directories=True)
         last_commit_hash = repo.head.object.hexsha
     except:
diff --git a/src/blenderbim/blenderbim/bim/__init__.py b/src/blenderbim/blenderbim/bim/__init__.py
index 3f1808562d..51f2c02614 100644
--- a/src/blenderbim/blenderbim/bim/__init__.py
+++ b/src/blenderbim/blenderbim/bim/__init__.py
@@ -196,7 +196,6 @@ for mod in modules.values():
 addon_keymaps = []
 icons = None
 is_registering = False
-last_commit_hash = "8888888"
 original_scene_panels_polls: dict[bpy.types.Panel, Union[Callable, None]] = dict()
 
 
diff --git a/src/blenderbim/blenderbim/tool/blender.py b/src/blenderbim/blenderbim/tool/blender.py
index 75db8b2fe3..004c4cc34b 100644
--- a/src/blenderbim/blenderbim/tool/blender.py
+++ b/src/blenderbim/blenderbim/tool/blender.py
@@ -920,7 +920,8 @@ class Blender(blenderbim.core.tool.Blender):
     @classmethod
     def get_last_commit_hash(cls) -> Union[str, None]:
         """Get 8 symbols of last commit hash if it's present or return None otherwise."""
-        commit_hash = blenderbim.bim.last_commit_hash
+        bbim = cls.get_bbim_extension_package()
+        commit_hash = bbim.last_commit_hash
 
         # Commit hash is unset - user is using __init__ from repo
         # without setting up git repository.