Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle-Samuli Riihikoski <haikalle@gmail.com>2018-11-15 21:22:08 +0300
committerKalle-Samuli Riihikoski <haikalle@gmail.com>2018-11-15 21:22:08 +0300
commit85562f136f980909bc4ff665b82c17ba2050785d (patch)
tree6d28d8fe2de1304ea826b30c24ca81063f744fee
parenta4796ab59660616f7466b10d1052fd06801c3935 (diff)
Wrong index count in array
-rw-r--r--io_coat3D/__init__.py39
-rw-r--r--io_coat3D/tex.py64
2 files changed, 65 insertions, 38 deletions
diff --git a/io_coat3D/__init__.py b/io_coat3D/__init__.py
index 326445b8..867521d5 100644
--- a/io_coat3D/__init__.py
+++ b/io_coat3D/__init__.py
@@ -418,7 +418,8 @@ class SCENE_OT_export(bpy.types.Operator):
if(coat3D.type == 'ppp' or coat3D.type == 'mv' or coat3D.type == 'ptex'):
bpy.ops.export_scene.fbx(filepath=coa.applink_address, use_selection=True, use_mesh_modifiers=False, axis_forward='X', axis_up='Y')
else:
- bpy.ops.export_scene.fbx(filepath=coa.applink_address, use_selection=True, use_mesh_modifiers=False, axis_up='Z', axis_forward='Y')
+ bpy.ops.export_scene.fbx(filepath=coa.applink_address, use_selection=True, use_mesh_modifiers=False, axis_up='Y', axis_forward='-Z')
+ objekti.coat3D.type = 'Voxel'
file = open(importfile, "w")
@@ -576,13 +577,25 @@ class SCENE_OT_import(bpy.types.Operator):
print('DIFF_OBJECS:', diff_objects)
print('find name:', name_boxs[0])
found_obj = False
- for proxy_objects in diff_objects:
- print('applink obj:', objekti.coat3D.applink_name)
- if (proxy_objects.startswith(objekti.coat3D.applink_name + '.')):
- print('Proxy NAME: ', name_boxs[0])
+
+ '''Changes objects mesh into proxy mesh'''
+
+ if(objekti.coat3D.type == ''):
+ for proxy_objects in diff_objects:
print('applink obj:', objekti.coat3D.applink_name)
- obj_proxy = bpy.data.objects[proxy_objects]
- found_obj = True
+ if (proxy_objects.startswith(objekti.coat3D.applink_name + '.')):
+ print('Proxy NAME: ', name_boxs[0])
+ print('applink obj:', objekti.coat3D.applink_name)
+ obj_proxy = bpy.data.objects[proxy_objects]
+ found_obj = True
+ elif(objekti.coat3D.type == 'Voxel' and len(object_list) == 1):
+ obj_proxy = bpy.data.objects[diff_objects[0]]
+ found_obj = True
+ if objekti.coat3D.applink_firsttime == True:
+ objekti.rotation_euler[0] = 1.5708
+ bpy.ops.object.transforms_to_deltas(mode='ROT')
+ objekti.coat3D.applink_firsttime = False
+
if(found_obj == True):
exportfile = coat3D.exchangedir
path3b_n = coat3D.exchangedir
@@ -953,12 +966,7 @@ class VIEW3D_MT_ExtraMenu(bpy.types.Menu):
layout.separator()
class ObjectCoat3D(PropertyGroup):
- objpath: StringProperty(
- name="Object_Path"
- )
- NoteGroup: StringProperty(
- name="Object_Path"
- )
+
obj_mat: StringProperty(
name="Object_Path",
default=''
@@ -983,6 +991,11 @@ class ObjectCoat3D(PropertyGroup):
description="FirstTime",
default=True
)
+ type: StringProperty(
+ name="type",
+ description="shows type",
+ default=''
+ )
import_mesh: BoolProperty(
name="ImportMesh",
description="ImportMesh",
diff --git a/io_coat3D/tex.py b/io_coat3D/tex.py
index ef6239ca..c5c35052 100644
--- a/io_coat3D/tex.py
+++ b/io_coat3D/tex.py
@@ -100,6 +100,8 @@ def createnodes(mat_list,texcoat): #luo nodes palikat ja linkittaa tekstuurit ni
if(node.name == '3DC_Applink' and node.type == 'GROUP'):
applink_group_node = True
act_material = node.node_tree
+ group_tree = node.node_tree
+ applink_tree = node
break
@@ -121,6 +123,7 @@ def createnodes(mat_list,texcoat): #luo nodes palikat ja linkittaa tekstuurit ni
#seuraavaksi lahdemme rakentamaan node tree. Lahdetaan Material Outputista rakentaa
if(applink_group_node == False and coat3D.creategroup):
+ print('tulleekko tanne')
group_tree = bpy.data.node_groups.new('3DC_Applink', 'ShaderNodeTree')
applink_tree = act_material.nodes.new('ShaderNodeGroup')
applink_tree.name = '3DC_Applink'
@@ -128,6 +131,19 @@ def createnodes(mat_list,texcoat): #luo nodes palikat ja linkittaa tekstuurit ni
applink_tree.location = -400, 300
act_material = group_tree
notegroup = act_material.nodes.new('NodeGroupOutput')
+ else:
+ index = 0
+ for node in mat_list[0].node_tree.nodes:
+ if (node.type == 'GROUP' and node.name =='3DC_Applink'):
+ for in_node in node.node_tree.nodes:
+ if(in_node.type == 'GROUP_OUTPUT'):
+ notegroup = in_node
+ index = 1
+ break
+ if(index == 1):
+ break
+
+
if(main_mat.inputs['Surface'].is_linked == True):
glue_mat = main_mat.inputs['Surface'].links[0].from_node
@@ -135,9 +151,10 @@ def createnodes(mat_list,texcoat): #luo nodes palikat ja linkittaa tekstuurit ni
input_color = glue_mat.inputs.find('Color')
else:
input_color = glue_mat.inputs.find('Base Color')
- input_index = 0
+
#Color
if(bring_color == True and texcoat['color'] != []):
+ print('Tuleeko color tekstuuri kahteen kertaan')
node = act_material.nodes.new('ShaderNodeTexImage')
node.name = '3DC_color'
if (texcoat['color']):
@@ -164,18 +181,17 @@ def createnodes(mat_list,texcoat): #luo nodes palikat ja linkittaa tekstuurit ni
node.location = -990, 530
curvenode.location = -660, 480
huenode.location = -337, 335
+
if(coat3D.creategroup):
- act_material.links.new(huenode.outputs[0], notegroup.inputs[input_index])
- group_tree.outputs[input_index].name = 'Color'
- main_material.links.new(applink_tree.outputs[input_index], glue_mat.inputs[input_color])
- input_index += 1
+ act_material.links.new(huenode.outputs[0], notegroup.inputs[len(notegroup.inputs)-1])
+ group_tree.outputs[len(group_tree.outputs)-1].name = 'Color'
+ main_material.links.new(applink_tree.outputs[len(applink_tree.outputs)-1], glue_mat.inputs[input_color])
else:
if (coat3D.creategroup):
node.location = -400, 400
- act_material.links.new(node.outputs[0], notegroup.inputs[input_index])
+ act_material.links.new(node.outputs[0], notegroup.inputs[len(notegroup.inputs)-1])
if (input_color != -1):
- main_material.links.new(applink_tree.outputs[input_index], glue_mat.inputs[input_color])
- input_index += 1
+ main_material.links.new(applink_tree.outputs[len(applink_tree.outputs)-1], glue_mat.inputs[input_color])
else:
node.location = -400,400
@@ -201,17 +217,15 @@ def createnodes(mat_list,texcoat): #luo nodes palikat ja linkittaa tekstuurit ni
curvenode.location = -668, 113
huenode.location = -345, 118
if (coat3D.creategroup):
- act_material.links.new(huenode.outputs[0], notegroup.inputs[input_index])
- group_tree.outputs[input_index].name = 'Metalness'
- main_material.links.new(applink_tree.outputs[input_index], glue_mat.inputs[input_color])
- input_index += 1
+ act_material.links.new(huenode.outputs[0], notegroup.inputs[len(notegroup.inputs)-1])
+ group_tree.outputs[len(group_tree.outputs) - 1].name = 'Metalness'
+ main_material.links.new(applink_tree.outputs[len(applink_tree.outputs)-1], glue_mat.inputs[input_color])
else:
if (coat3D.creategroup):
node.location = -830, 160
- act_material.links.new(node.outputs[0], notegroup.inputs[input_index])
+ act_material.links.new(node.outputs[0], notegroup.inputs[len(notegroup.inputs)-1])
if (input_color != -1):
- main_material.links.new(applink_tree.outputs[input_index], glue_mat.inputs[input_color])
- input_index += 1
+ main_material.links.new(applink_tree.outputs[len(applink_tree.outputs)-1], glue_mat.inputs[input_color])
else:
node.location = -830, 160
if (input_color != -1):
@@ -237,17 +251,17 @@ def createnodes(mat_list,texcoat): #luo nodes palikat ja linkittaa tekstuurit ni
curvenode.location = -670, -245
huenode.location = -340, -100
if (coat3D.creategroup):
- act_material.links.new(huenode.outputs[0], notegroup.inputs[input_index])
- group_tree.outputs[input_index].name = 'Roughness'
- main_material.links.new(applink_tree.outputs[input_index], glue_mat.inputs[input_color])
- input_index += 1
+ act_material.links.new(huenode.outputs[0], notegroup.inputs[len(notegroup.inputs)-1])
+ group_tree.outputs[len(group_tree.outputs) - 1].name = 'Roughness'
+ main_material.links.new(applink_tree.outputs[len(applink_tree.outputs)-1], glue_mat.inputs[input_color])
+
else:
if (coat3D.creategroup):
node.location = -550, 0
- act_material.links.new(node.outputs[0], notegroup.inputs[input_index])
+ act_material.links.new(node.outputs[0],notegroup.inputs[len(notegroup.inputs)-1])
if (input_color != -1):
- main_material.links.new(applink_tree.outputs[input_index], glue_mat.inputs[input_color])
- input_index += 1
+ main_material.links.new(applink_tree.outputs[len(applink_tree.outputs)-1], glue_mat.inputs[input_color])
+
else:
node.location = -550, 0
if (input_color != -1):
@@ -267,9 +281,9 @@ def createnodes(mat_list,texcoat): #luo nodes palikat ja linkittaa tekstuurit ni
act_material.links.new(node.outputs[0], normal_node.inputs[1])
act_material.links.new(normal_node.outputs[0], glue_mat.inputs[input_color])
if (coat3D.creategroup):
- act_material.links.new(normal_node.outputs[0], notegroup.inputs[input_index])
- main_material.links.new(applink_tree.outputs[input_index], glue_mat.inputs[input_color])
- input_index += 1
+ act_material.links.new(normal_node.outputs[0], notegroup.inputs[len(notegroup.inputs)-1])
+ main_material.links.new(applink_tree.outputs[len(applink_tree.outputs)-1], glue_mat.inputs[input_color])
+
def matlab(objekti,mat_list,texturelist,is_new):