[Bf-extensions-cvs] [1b09e569] blender2.8: color texture name was wrong

Kalle-Samuli Riihikoski noreply at git.blender.org
Mon Dec 10 16:17:51 CET 2018


Commit: 1b09e5695488dfffd2c2cc9381e186428226cdb9
Author: Kalle-Samuli Riihikoski
Date:   Mon Dec 10 17:14:28 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBA1b09e5695488dfffd2c2cc9381e186428226cdb9

color texture name was wrong

===================================================================

M	io_coat3D/__init__.py
M	io_coat3D/tex.py

===================================================================

diff --git a/io_coat3D/__init__.py b/io_coat3D/__init__.py
index f1b408e4..6ea62961 100644
--- a/io_coat3D/__init__.py
+++ b/io_coat3D/__init__.py
@@ -649,15 +649,15 @@ class SCENE_OT_import(bpy.types.Operator):
                             bpy.ops.object.select_all(action='TOGGLE')
 
                             if objekti.coat3D.applink_firsttime == True and objekti.coat3D.type == 'vox':
-                                #objekti.scale = (objekti.scale[0] / objekti.coat3D.applink_scale[0], objekti.scale[1] / objekti.coat3D.applink_scale[1], objekti.scale[2] / objekti.coat3D.applink_scale[2])
-                                #bpy.ops.object.transforms_to_deltas(mode='SCALE')
+                                objekti.select_set(True)
+
                                 objekti.rotation_euler[0] = 1.5708
                                 objekti.rotation_euler[2] = 1.5708
                                 bpy.ops.object.transforms_to_deltas(mode='ROT')
-                                #objekti.rotation_euler = (0, 0, 0)
-                                objekti.scale = (0.02, 0.02, 0.02)
+                                objekti.scale = (0.01, 0.01, 0.01)
                                 bpy.ops.object.transforms_to_deltas(mode='SCALE')
                                 objekti.coat3D.applink_firsttime = False
+                                objekti.select_set(False)
 
                             elif objekti.coat3D.applink_firsttime == True:
                                 objekti.scale = (objekti.scale[0]/objekti.coat3D.applink_scale[0],objekti.scale[1]/objekti.coat3D.applink_scale[1],objekti.scale[2]/objekti.coat3D.applink_scale[2])
@@ -747,8 +747,6 @@ class SCENE_OT_import(bpy.types.Operator):
                         bpy.context.collection.all_objects[del_obj].select_set(True)
                         bpy.ops.object.delete()
 
-
-
         else:
 
             '''
diff --git a/io_coat3D/tex.py b/io_coat3D/tex.py
index 4973bd4f..97c3c92b 100644
--- a/io_coat3D/tex.py
+++ b/io_coat3D/tex.py
@@ -49,11 +49,14 @@ def readtexturefolder(objekti, mat_list, texturelist, is_new): #read textures fr
 
         texcoat = {}
         texcoat['color'] = []
-        texcoat['metalness'] = []
+        texcoat['ao'] = []
         texcoat['rough'] = []
+        texcoat['metalness'] = []
         texcoat['nmap'] = []
         texcoat['disp'] = []
         texcoat['emissive'] = []
+        texcoat['emissive_power'] = []
+        texcoat['displacement'] = []
 
 
         for texture_info in texturelist:
@@ -73,6 +76,15 @@ def readtexturefolder(objekti, mat_list, texturelist, is_new): #read textures fr
                 if texture_info[2] == 'emissive':
                     texcoat['emissive'].append(texture_info[3])
                     create_nodes = True
+                if texture_info[2] == 'emissive_power':
+                    texcoat['emissive_power'].append(texture_info[3])
+                    create_nodes = True
+                if texture_info[2] == 'ao':
+                    texcoat['ao'].append(texture_info[3])
+                    create_nodes = True
+                if texture_info[2].startswith('displacement'):
+                    texcoat['displacement'].append(texture_info[3])
+                    create_nodes = True
 
         if(create_nodes):
             coat3D = bpy.context.scene.coat3D
@@ -147,6 +159,10 @@ def createnodes(active_mat,texcoat): #luo nodes palikat ja linkittaa tekstuurit
         group_tree.outputs.new("NodeSocketColor", "Metallic")
         group_tree.outputs.new("NodeSocketColor", "Roughness")
         group_tree.outputs.new("NodeSocketVector", "Normal map")
+        group_tree.outputs.new("NodeSocketColor", "Displacement")
+        group_tree.outputs.new("NodeSocketColor", "Emissive")
+        group_tree.outputs.new("NodeSocketColor", "Emissive Power")
+        group_tree.outputs.new("NodeSocketColor", "AO")
         applink_tree = act_material.nodes.new('ShaderNodeGroup')
         applink_tree.name = '3DC_Applink'
         applink_tree.node_tree = group_tree
@@ -174,20 +190,11 @@ def createnodes(active_mat,texcoat): #luo nodes palikat ja linkittaa tekstuurit
 
         #Color
         if(bring_color == True and texcoat['color'] != []):
+            print('Color:', texcoat['color'][0])
             node = act_material.nodes.new('ShaderNodeTexImage')
             node.name = '3DC_color'
             if (texcoat['color']):
-                sameimage = False
-                for image in bpy.data.images:
-                    if(image.filepath == texcoat['color'][0]):
-                        sameimage = True
-                        imagename = image
-                        break
-
-                if sameimage == True:
-                    node.image = imagename
-                else:
-                    node.image = bpy.data.images.load(texcoat['color'][0])
+               node.image = bpy.data.images.load(texcoat['color'][0])
 
             if(coat3D.createnodes):
                 curvenode = act_material.nodes.new('ShaderNodeRGBCurve')



More information about the Bf-extensions-cvs mailing list