blender
/
blender-addons
17
33
Fork 92
Code Issues 527 Pull Requests 32 Projects 1 Releases Wiki Activity

Fix syntax error by resolving merge conflict

This commit is contained in:
Sergey Sharybin 2020-08-17 12:00:46 +02:00
parent 809ee38132
commit 6ba9c816f3
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
io_coat3D/__init__.py
View File

@ -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'}