diff --git a/docs/source/change-log.md b/docs/source/change-log.md index 7586911b..5eb2f352 100644 --- a/docs/source/change-log.md +++ b/docs/source/change-log.md @@ -4,8 +4,9 @@ To update a develop installation to this version, you need to run `cathy install system --update`. This should clone new repositories and install all modified modules in the Anaconda environment. You may also have to update the Catharsys installation in Blender using `cathy blender init -c [your config]`. -- **Blender 4.0 Support** +- **Blender** - Blender 4 has some breaking changes in its' Python code. The Catharsys code has been adapted to support Blender 3.x and 4.0. + - Only the Catharsys modules that are needed in Blender are installed to Blender python now. The list of modules that are installed is given in the file `image-render-actions-std-blender/src/catharsys/plugins/std/blender/data/blender-install.json5`. The module names are actually interpreted as regular expressions. - **Generative AI Action** - A generative AI action repository is now added as `image-render-generative`. diff --git a/src/catharsys/setup/module.py b/src/catharsys/setup/module.py index ed82a25c..7abb1c63 100644 --- a/src/catharsys/setup/module.py +++ b/src/catharsys/setup/module.py @@ -597,7 +597,19 @@ def InstallModules( bForceDist: bool, bForceInstall: bool, bSourceDist: bool, + lIncludeRegEx: list[str] = [], ): + lIncRegEx: list[str] = [] + if isinstance(g_debug_lInstallModules, list) and len(g_debug_lInstallModules) > 0: + lIncRegEx.extend(g_debug_lInstallModules) + # endif + + if isinstance(lIncludeRegEx, list) and len(lIncludeRegEx) > 0: + lIncRegEx.extend(lIncludeRegEx) + # endif + + # print(f"lIncRegEx: {lIncRegEx}") + ForEach( bForceDist=bForceDist, bSourceDist=bSourceDist, @@ -605,7 +617,7 @@ def InstallModules( # funcRunDist=CreateInstallDistHandler(sPathPythonProg, bForceInstall), funcRunRepo=CRepoHandlerFactory.CreateInstall(sPathPythonProg, bForceInstall), funcRunDist=CDistHandlerFactory.CreateInstall(sPathPythonProg, bForceInstall), - lIncludeRegEx=g_debug_lInstallModules, + lIncludeRegEx=lIncRegEx, lExcludeRegEx=["image-render-workspace-.+"], )