diff --git a/.hg/00changelog.i b/.hg/00changelog.i deleted file mode 100644 index 22e0643..0000000 Binary files a/.hg/00changelog.i and /dev/null differ diff --git a/.hg/branch b/.hg/branch deleted file mode 100644 index 4ad96d5..0000000 --- a/.hg/branch +++ /dev/null @@ -1 +0,0 @@ -default diff --git a/.hg/cache/branch2-served b/.hg/cache/branch2-served deleted file mode 100644 index 6332a21..0000000 --- a/.hg/cache/branch2-served +++ /dev/null @@ -1,3 +0,0 @@ -8db6da6ed789b411f06a8665f3ba323c6dbedd10 13 -74dd5c544c4bbbebf2771bdb665c57dff4d5f4bb o default -8db6da6ed789b411f06a8665f3ba323c6dbedd10 o default diff --git a/.hg/cache/rbc-names-v1 b/.hg/cache/rbc-names-v1 deleted file mode 100644 index 331d858..0000000 --- a/.hg/cache/rbc-names-v1 +++ /dev/null @@ -1 +0,0 @@ -default \ No newline at end of file diff --git a/.hg/cache/rbc-revs-v1 b/.hg/cache/rbc-revs-v1 deleted file mode 100644 index 82e39a5..0000000 Binary files a/.hg/cache/rbc-revs-v1 and /dev/null differ diff --git a/.hg/cache/tags2-visible b/.hg/cache/tags2-visible deleted file mode 100644 index 8110f72..0000000 --- a/.hg/cache/tags2-visible +++ /dev/null @@ -1 +0,0 @@ -13 8db6da6ed789b411f06a8665f3ba323c6dbedd10 diff --git a/.hg/cur-message.txt b/.hg/cur-message.txt deleted file mode 100644 index e69de29..0000000 diff --git a/.hg/dirstate b/.hg/dirstate deleted file mode 100644 index 2325125..0000000 Binary files a/.hg/dirstate and /dev/null differ diff --git a/.hg/last-message.txt b/.hg/last-message.txt deleted file mode 100644 index 6b58358..0000000 --- a/.hg/last-message.txt +++ /dev/null @@ -1,3 +0,0 @@ -[BUF FIX] Botão de conversão não aparecia pois no modo "2" de seleção, levantava error quando tinha selecionado objetos que não tinham material data - -[ADDED] Adicionado na função pos de universal material, que detecta quando o transmission foi alterado, deixando o albedo totalmente black \ No newline at end of file diff --git a/.hg/requires b/.hg/requires deleted file mode 100644 index 52fc616..0000000 --- a/.hg/requires +++ /dev/null @@ -1,7 +0,0 @@ -dotencode -fncache -generaldelta -revlog-compression-zstd -revlogv1 -sparserevlog -store diff --git a/.hg/store/00changelog.i b/.hg/store/00changelog.i deleted file mode 100644 index 3f14965..0000000 Binary files a/.hg/store/00changelog.i and /dev/null differ diff --git a/.hg/store/00manifest.i b/.hg/store/00manifest.i deleted file mode 100644 index b3d5f9a..0000000 Binary files a/.hg/store/00manifest.i and /dev/null differ diff --git a/.hg/store/data/____init____.py.i b/.hg/store/data/____init____.py.i deleted file mode 100644 index 0b99cdb..0000000 Binary files a/.hg/store/data/____init____.py.i and /dev/null differ diff --git a/.hg/store/data/____pycache____/____init____.cpython-39.pyc.i b/.hg/store/data/____pycache____/____init____.cpython-39.pyc.i deleted file mode 100644 index 4ca4e2c..0000000 Binary files a/.hg/store/data/____pycache____/____init____.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/____init____.py.i b/.hg/store/data/addon/____init____.py.i deleted file mode 100644 index bf69de5..0000000 Binary files a/.hg/store/data/addon/____init____.py.i and /dev/null differ diff --git a/.hg/store/data/addon/____pycache____/____init____.cpython-39.pyc.i b/.hg/store/data/addon/____pycache____/____init____.cpython-39.pyc.i deleted file mode 100644 index 197755c..0000000 Binary files a/.hg/store/data/addon/____pycache____/____init____.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/menu/____init____.py.i b/.hg/store/data/addon/menu/____init____.py.i deleted file mode 100644 index bf69de5..0000000 Binary files a/.hg/store/data/addon/menu/____init____.py.i and /dev/null differ diff --git a/.hg/store/data/addon/operator/____init____.py.i b/.hg/store/data/addon/operator/____init____.py.i deleted file mode 100644 index 9c2bcd3..0000000 Binary files a/.hg/store/data/addon/operator/____init____.py.i and /dev/null differ diff --git a/.hg/store/data/addon/operator/____pycache____/____init____.cpython-39.pyc.i b/.hg/store/data/addon/operator/____pycache____/____init____.cpython-39.pyc.i deleted file mode 100644 index 9aa2ad1..0000000 Binary files a/.hg/store/data/addon/operator/____pycache____/____init____.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/operator/____pycache____/add__lights.cpython-39.pyc.i b/.hg/store/data/addon/operator/____pycache____/add__lights.cpython-39.pyc.i deleted file mode 100644 index 80358ce..0000000 Binary files a/.hg/store/data/addon/operator/____pycache____/add__lights.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/operator/____pycache____/convert__nodes.cpython-39.pyc.i b/.hg/store/data/addon/operator/____pycache____/convert__nodes.cpython-39.pyc.i deleted file mode 100644 index c3e382a..0000000 Binary files a/.hg/store/data/addon/operator/____pycache____/convert__nodes.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/operator/convert__nodes.py.i b/.hg/store/data/addon/operator/convert__nodes.py.i deleted file mode 100644 index 9c8fac4..0000000 Binary files a/.hg/store/data/addon/operator/convert__nodes.py.i and /dev/null differ diff --git a/.hg/store/data/addon/panels/____init____.py.i b/.hg/store/data/addon/panels/____init____.py.i deleted file mode 100644 index f427113..0000000 Binary files a/.hg/store/data/addon/panels/____init____.py.i and /dev/null differ diff --git a/.hg/store/data/addon/panels/____pycache____/____init____.cpython-39.pyc.i b/.hg/store/data/addon/panels/____pycache____/____init____.cpython-39.pyc.i deleted file mode 100644 index a2e9b6e..0000000 Binary files a/.hg/store/data/addon/panels/____pycache____/____init____.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/panels/____pycache____/main__panel.cpython-39.pyc.i b/.hg/store/data/addon/panels/____pycache____/main__panel.cpython-39.pyc.i deleted file mode 100644 index 81a621d..0000000 Binary files a/.hg/store/data/addon/panels/____pycache____/main__panel.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/panels/main__panel.py.i b/.hg/store/data/addon/panels/main__panel.py.i deleted file mode 100644 index 1f7e939..0000000 Binary files a/.hg/store/data/addon/panels/main__panel.py.i and /dev/null differ diff --git a/.hg/store/data/addon/property/____init____.py.i b/.hg/store/data/addon/property/____init____.py.i deleted file mode 100644 index a46e1c8..0000000 Binary files a/.hg/store/data/addon/property/____init____.py.i and /dev/null differ diff --git a/.hg/store/data/addon/property/____pycache____/____init____.cpython-39.pyc.i b/.hg/store/data/addon/property/____pycache____/____init____.cpython-39.pyc.i deleted file mode 100644 index 64c64b3..0000000 Binary files a/.hg/store/data/addon/property/____pycache____/____init____.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/property/____pycache____/addon__props.cpython-39.pyc.i b/.hg/store/data/addon/property/____pycache____/addon__props.cpython-39.pyc.i deleted file mode 100644 index 313d6d0..0000000 Binary files a/.hg/store/data/addon/property/____pycache____/addon__props.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/property/addon__props.py.i b/.hg/store/data/addon/property/addon__props.py.i deleted file mode 100644 index 72fc189..0000000 Binary files a/.hg/store/data/addon/property/addon__props.py.i and /dev/null differ diff --git a/.hg/store/data/addon/register/____init____.py.i b/.hg/store/data/addon/register/____init____.py.i deleted file mode 100644 index 42696e0..0000000 Binary files a/.hg/store/data/addon/register/____init____.py.i and /dev/null differ diff --git a/.hg/store/data/addon/register/____pycache____/____init____.cpython-39.pyc.i b/.hg/store/data/addon/register/____pycache____/____init____.cpython-39.pyc.i deleted file mode 100644 index 1a431e9..0000000 Binary files a/.hg/store/data/addon/register/____pycache____/____init____.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/____init____.py.i b/.hg/store/data/addon/utility/____init____.py.i deleted file mode 100644 index bf69de5..0000000 Binary files a/.hg/store/data/addon/utility/____init____.py.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/____pycache____/____init____.cpython-39.pyc.i b/.hg/store/data/addon/utility/____pycache____/____init____.cpython-39.pyc.i deleted file mode 100644 index 9c9c811..0000000 Binary files a/.hg/store/data/addon/utility/____pycache____/____init____.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/____pycache____/cycles2octane__functions.cpython-39.pyc.i b/.hg/store/data/addon/utility/____pycache____/cycles2octane__functions.cpython-39.pyc.i deleted file mode 100644 index 8449150..0000000 Binary files a/.hg/store/data/addon/utility/____pycache____/cycles2octane__functions.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/____pycache____/cycles2octane__post__functions.cpython-39.pyc.i b/.hg/store/data/addon/utility/____pycache____/cycles2octane__post__functions.cpython-39.pyc.i deleted file mode 100644 index fe0073d..0000000 Binary files a/.hg/store/data/addon/utility/____pycache____/cycles2octane__post__functions.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/____pycache____/cycles2octane__pre__functions.cpython-39.pyc.i b/.hg/store/data/addon/utility/____pycache____/cycles2octane__pre__functions.cpython-39.pyc.i deleted file mode 100644 index 88a270f..0000000 Binary files a/.hg/store/data/addon/utility/____pycache____/cycles2octane__pre__functions.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/____pycache____/functions.cpython-39.pyc.i b/.hg/store/data/addon/utility/____pycache____/functions.cpython-39.pyc.i deleted file mode 100644 index da4f4c5..0000000 Binary files a/.hg/store/data/addon/utility/____pycache____/functions.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/____pycache____/node__converter__functions.cpython-39.pyc.i b/.hg/store/data/addon/utility/____pycache____/node__converter__functions.cpython-39.pyc.i deleted file mode 100644 index cb0b987..0000000 Binary files a/.hg/store/data/addon/utility/____pycache____/node__converter__functions.cpython-39.pyc.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/cycles2octane__data.json.i b/.hg/store/data/addon/utility/cycles2octane__data.json.i deleted file mode 100644 index 364df5f..0000000 Binary files a/.hg/store/data/addon/utility/cycles2octane__data.json.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/cycles2octane__functions.py.i b/.hg/store/data/addon/utility/cycles2octane__functions.py.i deleted file mode 100644 index 13ce803..0000000 Binary files a/.hg/store/data/addon/utility/cycles2octane__functions.py.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/cycles2octane__post__functions.py.i b/.hg/store/data/addon/utility/cycles2octane__post__functions.py.i deleted file mode 100644 index abce79c..0000000 Binary files a/.hg/store/data/addon/utility/cycles2octane__post__functions.py.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/cycles2octane__pre__functions.py.i b/.hg/store/data/addon/utility/cycles2octane__pre__functions.py.i deleted file mode 100644 index 4e74ca2..0000000 Binary files a/.hg/store/data/addon/utility/cycles2octane__pre__functions.py.i and /dev/null differ diff --git a/.hg/store/data/addon/utility/functions.py.i b/.hg/store/data/addon/utility/functions.py.i deleted file mode 100644 index 245b6eb..0000000 Binary files a/.hg/store/data/addon/utility/functions.py.i and /dev/null differ diff --git a/.hg/store/data/~2ehgignore.i b/.hg/store/data/~2ehgignore.i deleted file mode 100644 index bf69de5..0000000 Binary files a/.hg/store/data/~2ehgignore.i and /dev/null differ diff --git a/.hg/store/fncache b/.hg/store/fncache deleted file mode 100644 index 2ecedbc..0000000 --- a/.hg/store/fncache +++ /dev/null @@ -1,33 +0,0 @@ -data/addon/property/addon_props.py.i -data/addon/utility/__pycache__/cycles2octane_functions.cpython-39.pyc.i -data/addon/operator/__init__.py.i -data/addon/register/__init__.py.i -data/addon/property/__pycache__/__init__.cpython-39.pyc.i -data/addon/utility/__init__.py.i -data/addon/register/__pycache__/__init__.cpython-39.pyc.i -data/addon/operator/__pycache__/add_lights.cpython-39.pyc.i -data/addon/utility/cycles2octane_functions.py.i -data/addon/operator/__pycache__/__init__.cpython-39.pyc.i -data/addon/panels/__pycache__/__init__.cpython-39.pyc.i -data/addon/utility/__pycache__/__init__.cpython-39.pyc.i -data/addon/operator/__pycache__/convert_nodes.cpython-39.pyc.i -data/addon/__pycache__/__init__.cpython-39.pyc.i -data/addon/property/__pycache__/addon_props.cpython-39.pyc.i -data/__pycache__/__init__.cpython-39.pyc.i -data/addon/utility/__pycache__/functions.cpython-39.pyc.i -data/__init__.py.i -data/addon/panels/main_panel.py.i -data/addon/utility/functions.py.i -data/addon/operator/convert_nodes.py.i -data/addon/property/__init__.py.i -data/.hgignore.i -data/addon/panels/__init__.py.i -data/addon/utility/cycles2octane_data.json.i -data/addon/panels/__pycache__/main_panel.cpython-39.pyc.i -data/addon/utility/__pycache__/node_converter_functions.cpython-39.pyc.i -data/addon/__init__.py.i -data/addon/menu/__init__.py.i -data/addon/utility/__pycache__/cycles2octane_pre_functions.cpython-39.pyc.i -data/addon/utility/cycles2octane_pre_functions.py.i -data/addon/utility/__pycache__/cycles2octane_post_functions.cpython-39.pyc.i -data/addon/utility/cycles2octane_post_functions.py.i diff --git a/.hg/store/phaseroots b/.hg/store/phaseroots deleted file mode 100644 index 6590090..0000000 --- a/.hg/store/phaseroots +++ /dev/null @@ -1 +0,0 @@ -1 57a2278621efc2f80a38bbb7d8876e654bacb146 diff --git a/.hg/store/undo b/.hg/store/undo deleted file mode 100644 index c8cfbff..0000000 Binary files a/.hg/store/undo and /dev/null differ diff --git a/.hg/store/undo.backup.fncache b/.hg/store/undo.backup.fncache deleted file mode 100644 index d8d3a5c..0000000 --- a/.hg/store/undo.backup.fncache +++ /dev/null @@ -1,29 +0,0 @@ -data/addon/property/addon_props.py.i -data/addon/utility/__pycache__/cycles2octane_functions.cpython-39.pyc.i -data/addon/operator/__init__.py.i -data/addon/register/__init__.py.i -data/addon/property/__pycache__/__init__.cpython-39.pyc.i -data/addon/utility/__init__.py.i -data/addon/register/__pycache__/__init__.cpython-39.pyc.i -data/addon/operator/__pycache__/add_lights.cpython-39.pyc.i -data/addon/utility/cycles2octane_functions.py.i -data/addon/operator/__pycache__/__init__.cpython-39.pyc.i -data/addon/panels/__pycache__/__init__.cpython-39.pyc.i -data/addon/utility/__pycache__/__init__.cpython-39.pyc.i -data/addon/operator/__pycache__/convert_nodes.cpython-39.pyc.i -data/addon/__pycache__/__init__.cpython-39.pyc.i -data/addon/property/__pycache__/addon_props.cpython-39.pyc.i -data/__pycache__/__init__.cpython-39.pyc.i -data/addon/utility/__pycache__/functions.cpython-39.pyc.i -data/__init__.py.i -data/addon/panels/main_panel.py.i -data/addon/utility/functions.py.i -data/addon/operator/convert_nodes.py.i -data/addon/property/__init__.py.i -data/.hgignore.i -data/addon/panels/__init__.py.i -data/addon/utility/cycles2octane_data.json.i -data/addon/panels/__pycache__/main_panel.cpython-39.pyc.i -data/addon/utility/__pycache__/node_converter_functions.cpython-39.pyc.i -data/addon/__init__.py.i -data/addon/menu/__init__.py.i diff --git a/.hg/store/undo.backupfiles b/.hg/store/undo.backupfiles deleted file mode 100644 index c8f32f4..0000000 Binary files a/.hg/store/undo.backupfiles and /dev/null differ diff --git a/.hg/store/undo.phaseroots b/.hg/store/undo.phaseroots deleted file mode 100644 index 6590090..0000000 --- a/.hg/store/undo.phaseroots +++ /dev/null @@ -1 +0,0 @@ -1 57a2278621efc2f80a38bbb7d8876e654bacb146 diff --git a/.hg/thgstatus b/.hg/thgstatus deleted file mode 100644 index 9656b93..0000000 --- a/.hg/thgstatus +++ /dev/null @@ -1,4 +0,0 @@ -maddon/operator -maddon/operator/__pycache__ -maddon/utility -maddon/utility/__pycache__ diff --git a/.hg/undo.backup.dirstate b/.hg/undo.backup.dirstate deleted file mode 100644 index 1fa7637..0000000 Binary files a/.hg/undo.backup.dirstate and /dev/null differ diff --git a/.hg/undo.bookmarks b/.hg/undo.bookmarks deleted file mode 100644 index e69de29..0000000 diff --git a/.hg/undo.branch b/.hg/undo.branch deleted file mode 100644 index 331d858..0000000 --- a/.hg/undo.branch +++ /dev/null @@ -1 +0,0 @@ -default \ No newline at end of file diff --git a/.hg/undo.desc b/.hg/undo.desc deleted file mode 100644 index 5e6c164..0000000 --- a/.hg/undo.desc +++ /dev/null @@ -1,2 +0,0 @@ -13 -commit diff --git a/.hg/undo.dirstate b/.hg/undo.dirstate deleted file mode 100644 index 1fa7637..0000000 Binary files a/.hg/undo.dirstate and /dev/null differ diff --git a/.hg/wcache/manifestfulltextcache b/.hg/wcache/manifestfulltextcache deleted file mode 100644 index c81b959..0000000 Binary files a/.hg/wcache/manifestfulltextcache and /dev/null differ diff --git a/.hgignore b/.hgignore deleted file mode 100644 index e69de29..0000000 diff --git a/README.md b/README.md new file mode 100644 index 0000000..6e0becf --- /dev/null +++ b/README.md @@ -0,0 +1,62 @@ +# Cycles2Octane Material Converter + +[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) +[![Blender](https://img.shields.io/badge/Blender-3.3-orange.svg)](https://www.blender.org/download/releases/3-3/) +[![Octane](https://img.shields.io/badge/Octane-26.5-red.svg)](https://render.otoy.com/forum/viewtopic.php?f=113&t=80550/) + +## Overview + +Convert Cycles Materials to Octane Materials in Blender with a single click. + +![Converting](img/converter.gif) + +## Features + +- **Single Click Conversion**: Convert Cycles materials to Octane materials with a single click. +- **Reverse Conversion**: Convert Octane materials back to Cycles materials. +- **Support for Blender 3.3**: Fully compatible with Blender 3.3 and earlier versions. + +## Installation + +1. Download the addon from the [releases page](#). +2. Open Blender and go to `Edit > Preferences`. +3. Select `Add-ons` and click `Install`. +4. Choose the downloaded `.zip` file and click `Install Add-on`. +5. Enable the addon by checking the box next to `Cycles2Octane`. + +## Usage + +1. Go to the add-on panel located in the `Octane` tab. +2. Select the conversion method. +3. Click the `Convert Material Nodes` button. + +![Panel](img/panel.webp) + +# Supported Cycles Material Nodes + +| Cycles Node | Octane Node | +|---------------------------|-----------------------------------------------| +| ShaderNodeBsdfTranslucent | OctaneUniversalMaterial | +| ShaderNodeBsdfPrincipled | OctaneUniversalMaterial | +| ShaderNodeTexImage | ShaderNodeOctImageTex \| ShaderNodeOctAlphaImageTex | +| ShaderNodeOutputMaterial | ShaderNodeOutputMaterial | +| ShaderNodeInvert | OctaneInvertTexture | +| ShaderNodeMapping | Octane3DTransformation | +| ShaderNodeVertexColor | OctaneColorVertexAttribute | +| ShaderNodeMixRGB | OctaneMixTexture \| OctaneAddTexture \| OctaneMultiplyTexture \| OctaneSubtractTexture | +| ShaderNodeMath | OctaneBinaryMathOperation \| OctaneUnaryMathOperation | +| ShaderNodeBsdfTransparent | OctaneNullMaterial | +| ShaderNodeAddShader | OctaneMixMaterial | +| ShaderNodeMixShader | OctaneMixMaterial | +| ShaderNodeBsdfDiffuse | OctaneDiffuseMaterial | +| ShaderNodeBump | None | +| ShaderNodeNormalMap | None | +| ShaderNodeHueSaturation | OctaneColorCorrection | +| ShaderNodeBrightContrast | OctaneColorCorrection | +| ShaderNodeRGB | OctaneRGBColor | +| ShaderNodeMapRange | OctaneRange | + + +## License + +This project is licensed under the GPL v3 License - see the [LICENSE](LICENSE) file for details. \ No newline at end of file diff --git a/__init__.py b/__init__.py index 6e2ba6a..3bb7b3d 100644 --- a/__init__.py +++ b/__init__.py @@ -3,16 +3,19 @@ "description": "Convert material nodes from cycles to octane", "author": "Rodrigo Gama", "version": (0, 1, 7, 0), - "blender": (3, 0, 1), + "blender": (3, 3, 1), "location": "View3D", - "category": "3D View"} + "category": "3D View", +} def register(): from .addon.register import register_addon + register_addon() def unregister(): from .addon.register import unregister_addon + unregister_addon() diff --git a/__pycache__/__init__.cpython-310.pyc b/__pycache__/__init__.cpython-310.pyc index 41c2a68..b4c3749 100644 Binary files a/__pycache__/__init__.cpython-310.pyc and b/__pycache__/__init__.cpython-310.pyc differ diff --git a/__pycache__/__init__.cpython-39.pyc b/__pycache__/__init__.cpython-39.pyc index 7576956..60c6ffb 100644 Binary files a/__pycache__/__init__.cpython-39.pyc and b/__pycache__/__init__.cpython-39.pyc differ diff --git a/addon/__pycache__/__init__.cpython-310.pyc b/addon/__pycache__/__init__.cpython-310.pyc index 19c46dc..2c7af36 100644 Binary files a/addon/__pycache__/__init__.cpython-310.pyc and b/addon/__pycache__/__init__.cpython-310.pyc differ diff --git a/addon/operator/__pycache__/__init__.cpython-310.pyc b/addon/operator/__pycache__/__init__.cpython-310.pyc index 8b85d3b..27e1d68 100644 Binary files a/addon/operator/__pycache__/__init__.cpython-310.pyc and b/addon/operator/__pycache__/__init__.cpython-310.pyc differ diff --git a/addon/operator/__pycache__/__init__.cpython-39.pyc b/addon/operator/__pycache__/__init__.cpython-39.pyc index 820e13b..bc78fcc 100644 Binary files a/addon/operator/__pycache__/__init__.cpython-39.pyc and b/addon/operator/__pycache__/__init__.cpython-39.pyc differ diff --git a/addon/operator/__pycache__/convert_nodes.cpython-310.pyc b/addon/operator/__pycache__/convert_nodes.cpython-310.pyc index e3f4788..79a95bb 100644 Binary files a/addon/operator/__pycache__/convert_nodes.cpython-310.pyc and b/addon/operator/__pycache__/convert_nodes.cpython-310.pyc differ diff --git a/addon/operator/__pycache__/convert_nodes.cpython-39.pyc b/addon/operator/__pycache__/convert_nodes.cpython-39.pyc index 5462d8e..b1d1977 100644 Binary files a/addon/operator/__pycache__/convert_nodes.cpython-39.pyc and b/addon/operator/__pycache__/convert_nodes.cpython-39.pyc differ diff --git a/addon/panels/__pycache__/__init__.cpython-310.pyc b/addon/panels/__pycache__/__init__.cpython-310.pyc index 39e127f..1d7aa3b 100644 Binary files a/addon/panels/__pycache__/__init__.cpython-310.pyc and b/addon/panels/__pycache__/__init__.cpython-310.pyc differ diff --git a/addon/panels/__pycache__/main_panel.cpython-310.pyc b/addon/panels/__pycache__/main_panel.cpython-310.pyc index 1e962bd..cdb3b85 100644 Binary files a/addon/panels/__pycache__/main_panel.cpython-310.pyc and b/addon/panels/__pycache__/main_panel.cpython-310.pyc differ diff --git a/addon/panels/__pycache__/main_panel.cpython-39.pyc b/addon/panels/__pycache__/main_panel.cpython-39.pyc index 7931e56..ec9b63e 100644 Binary files a/addon/panels/__pycache__/main_panel.cpython-39.pyc and b/addon/panels/__pycache__/main_panel.cpython-39.pyc differ diff --git a/addon/property/__pycache__/__init__.cpython-310.pyc b/addon/property/__pycache__/__init__.cpython-310.pyc index 5a594dd..f83a742 100644 Binary files a/addon/property/__pycache__/__init__.cpython-310.pyc and b/addon/property/__pycache__/__init__.cpython-310.pyc differ diff --git a/addon/property/__pycache__/addon_props.cpython-310.pyc b/addon/property/__pycache__/addon_props.cpython-310.pyc index a79b812..b98eebf 100644 Binary files a/addon/property/__pycache__/addon_props.cpython-310.pyc and b/addon/property/__pycache__/addon_props.cpython-310.pyc differ diff --git a/addon/register/__pycache__/__init__.cpython-310.pyc b/addon/register/__pycache__/__init__.cpython-310.pyc index 12e72f2..07dabe7 100644 Binary files a/addon/register/__pycache__/__init__.cpython-310.pyc and b/addon/register/__pycache__/__init__.cpython-310.pyc differ diff --git a/addon/utility/__pycache__/__init__.cpython-310.pyc b/addon/utility/__pycache__/__init__.cpython-310.pyc index c8aea3e..b63fef6 100644 Binary files a/addon/utility/__pycache__/__init__.cpython-310.pyc and b/addon/utility/__pycache__/__init__.cpython-310.pyc differ diff --git a/addon/utility/__pycache__/constants.cpython-310.pyc b/addon/utility/__pycache__/constants.cpython-310.pyc index 2e83132..54a36d5 100644 Binary files a/addon/utility/__pycache__/constants.cpython-310.pyc and b/addon/utility/__pycache__/constants.cpython-310.pyc differ diff --git a/addon/utility/__pycache__/cycles2octane_custom_node_groups.cpython-310.pyc b/addon/utility/__pycache__/cycles2octane_custom_node_groups.cpython-310.pyc index d505e3a..6caa501 100644 Binary files a/addon/utility/__pycache__/cycles2octane_custom_node_groups.cpython-310.pyc and b/addon/utility/__pycache__/cycles2octane_custom_node_groups.cpython-310.pyc differ diff --git a/addon/utility/__pycache__/cycles2octane_format_nodes.cpython-310.pyc b/addon/utility/__pycache__/cycles2octane_format_nodes.cpython-310.pyc index 8502573..56c2511 100644 Binary files a/addon/utility/__pycache__/cycles2octane_format_nodes.cpython-310.pyc and b/addon/utility/__pycache__/cycles2octane_format_nodes.cpython-310.pyc differ diff --git a/addon/utility/__pycache__/cycles2octane_post_functions.cpython-310.pyc b/addon/utility/__pycache__/cycles2octane_post_functions.cpython-310.pyc index a7c09cb..4d0a678 100644 Binary files a/addon/utility/__pycache__/cycles2octane_post_functions.cpython-310.pyc and b/addon/utility/__pycache__/cycles2octane_post_functions.cpython-310.pyc differ diff --git a/addon/utility/__pycache__/cycles2octane_post_functions.cpython-39.pyc b/addon/utility/__pycache__/cycles2octane_post_functions.cpython-39.pyc index bbdc611..9cc94aa 100644 Binary files a/addon/utility/__pycache__/cycles2octane_post_functions.cpython-39.pyc and b/addon/utility/__pycache__/cycles2octane_post_functions.cpython-39.pyc differ diff --git a/addon/utility/__pycache__/cycles2octane_pre_functions.cpython-310.pyc b/addon/utility/__pycache__/cycles2octane_pre_functions.cpython-310.pyc index 6aa3577..3e5528e 100644 Binary files a/addon/utility/__pycache__/cycles2octane_pre_functions.cpython-310.pyc and b/addon/utility/__pycache__/cycles2octane_pre_functions.cpython-310.pyc differ diff --git a/addon/utility/__pycache__/cycles2octane_pre_functions.cpython-39.pyc b/addon/utility/__pycache__/cycles2octane_pre_functions.cpython-39.pyc index cdebf0c..8864ed8 100644 Binary files a/addon/utility/__pycache__/cycles2octane_pre_functions.cpython-39.pyc and b/addon/utility/__pycache__/cycles2octane_pre_functions.cpython-39.pyc differ diff --git a/addon/utility/__pycache__/functions.cpython-39.pyc b/addon/utility/__pycache__/functions.cpython-39.pyc index 27dc680..dfcb9e3 100644 Binary files a/addon/utility/__pycache__/functions.cpython-39.pyc and b/addon/utility/__pycache__/functions.cpython-39.pyc differ diff --git a/addon/utility/__pycache__/json_manager.cpython-310.pyc b/addon/utility/__pycache__/json_manager.cpython-310.pyc index c71e3be..6eda583 100644 Binary files a/addon/utility/__pycache__/json_manager.cpython-310.pyc and b/addon/utility/__pycache__/json_manager.cpython-310.pyc differ diff --git a/addon/utility/__pycache__/material_functions.cpython-310.pyc b/addon/utility/__pycache__/material_functions.cpython-310.pyc index 6754bf1..252ab1b 100644 Binary files a/addon/utility/__pycache__/material_functions.cpython-310.pyc and b/addon/utility/__pycache__/material_functions.cpython-310.pyc differ diff --git a/addon/utility/__pycache__/node_functions.cpython-310.pyc b/addon/utility/__pycache__/node_functions.cpython-310.pyc index e2c0c5c..ebf5509 100644 Binary files a/addon/utility/__pycache__/node_functions.cpython-310.pyc and b/addon/utility/__pycache__/node_functions.cpython-310.pyc differ diff --git a/addon/utility/__pycache__/node_replacer.cpython-310.pyc b/addon/utility/__pycache__/node_replacer.cpython-310.pyc index 9896209..28641a8 100644 Binary files a/addon/utility/__pycache__/node_replacer.cpython-310.pyc and b/addon/utility/__pycache__/node_replacer.cpython-310.pyc differ diff --git a/addon/utility/node_replacer.py b/addon/utility/node_replacer.py index 1626e39..d2f65cd 100644 --- a/addon/utility/node_replacer.py +++ b/addon/utility/node_replacer.py @@ -90,23 +90,25 @@ def __init__(self, original_node: Node): original_node, json_data) # Starting Replacement - if replace_node_data: + if not replace_node_data: + return None - # Running Pre Node Function - original_node = self._run_node_pre_function(original_node) + # Running Pre Node Function + original_node = self._run_node_pre_function(original_node) - new_node = self._replace_node( - original_node, null_node, custom_node_group, replace_node_data) + new_node = self._replace_node( + original_node, null_node, custom_node_group, replace_node_data) - if new_node: + if not new_node: + return None - new_node.width = original_node.width # keep the same width + new_node.width = original_node.width # keep the same width - new_node = self._run_node_post_function( - original_node, new_node, null_node) + new_node = self._run_node_post_function( + original_node, new_node, null_node) - self.new_node = new_node - original_node.id_data.nodes.remove(original_node) + self.new_node = new_node + original_node.id_data.nodes.remove(original_node) def _replace_node(self, node: Node, null_node: NullNode, custom_node_group: CustomNodeGroup, replace_node_data: ReplaceNodeData) -> Node: '''Execute the replace process using the ReplaceNodeData and NullNode data when exists ''' diff --git a/img/converter.gif b/img/converter.gif new file mode 100644 index 0000000..addff10 Binary files /dev/null and b/img/converter.gif differ diff --git a/img/panel.webp b/img/panel.webp new file mode 100644 index 0000000..2779ebe Binary files /dev/null and b/img/panel.webp differ