diff options
| author | Sergey Sharybin <sergey@blender.org> | 2020-08-17 13:00:46 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2020-08-17 13:01:54 +0300 |
| commit | 6ba9c816f3d8b342633cce3f874876f19b19118e (patch) | |
| tree | 4f4e158bc0a349d7736807387ec5963c7abe232c | |
| parent | 809ee38132d51972972a084e202a132cbd8615c8 (diff) | |
Fix syntax error by resolving merge conflict
| -rw-r--r-- | io_coat3D/__init__.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/io_coat3D/__init__.py b/io_coat3D/__init__.py index 5679f638..574d9869 100644 --- a/io_coat3D/__init__.py +++ b/io_coat3D/__init__.py @@ -827,21 +827,11 @@ class SCENE_OT_export(bpy.types.Operator): if(node.name.startswith('3DC_') == True): material.material.node_tree.nodes.remove(node) -<<<<<<< HEAD - - for ind, mat_list in enumerate(mod_mat_list): - if(mat_list == '__' + objekti.name): - for ind, mat in enumerate(mod_mat_list[mat_list]): - objekti.material_slots[mod_mat_list[mat_list][ind][0]].material = mod_mat_list[mat_list][ind][1] - -======= - for ind, mat_list in enumerate(mod_mat_list): if(mat_list == '__' + objekti.name): for ind, mat in enumerate(mod_mat_list[mat_list]): objekti.material_slots[mod_mat_list[mat_list][ind][0]].material = mod_mat_list[mat_list][ind][1] - ->>>>>>> 215ebd2a... io_coat3D: support for mac. ignores all types except MESH + bpy.context.scene.render.engine = active_render return {'FINISHED'} |