diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 23:18:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 23:19:10 +0300 |
| commit | 4c132dc503c7c9506e301be5b479c6c579ce9723 (patch) | |
| tree | 0cdd69eed9169d4b30a8c37dd33e5f80790ce3cc /io_coat3D | |
| parent | 772b5e1e245b76f0aab8b962d1e537b75ec0fbfe (diff) | |
| parent | f1c55295b0d95307559c1f8b09d6b8bd6c8bbbf0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'io_coat3D')
| -rw-r--r-- | io_coat3D/__init__.py | 6 | ||||
| -rw-r--r-- | io_coat3D/tex.py | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/io_coat3D/__init__.py b/io_coat3D/__init__.py index ba56d653..f7d0bc88 100644 --- a/io_coat3D/__init__.py +++ b/io_coat3D/__init__.py @@ -180,7 +180,7 @@ def make_texture_list(texturefolder): ''' -#Updating objects MESH part ( Mesh, Vertex Groups, Vertex Colors ) +#Updating objects MESH part ( Mesh, Vertex Groups, Vertex Colors ) ''' def updatemesh(objekti, proxy): @@ -333,8 +333,8 @@ class SCENE_OT_opencoat(bpy.types.Operator): file.write("\n[3B]") file.close() - ''' - If not Windows Os it will only write import.txt. Auto run 3d-coat.exe is disabled. + ''' + If not Windows Os it will only write import.txt. Auto run 3d-coat.exe is disabled. ''' else: diff --git a/io_coat3D/tex.py b/io_coat3D/tex.py index 733d8471..403b4b88 100644 --- a/io_coat3D/tex.py +++ b/io_coat3D/tex.py @@ -59,7 +59,7 @@ def readtexturefolder(objekti,is_new): #read textures from texture file texcoat[tex_name].append(koko_osoite) createnodes(objekti, texcoat) - + def checkmaterial(mat_list, objekti): #check how many materials object has mat_list = [] @@ -73,7 +73,7 @@ def createnodes(objekti,texcoat): #luo nodes palikat ja linkittaa tekstuurit nii bring_roughness = True bring_normal = True bring_disp = True - + act_material = objekti.active_material if(objekti.active_material.use_nodes == False): objekti.active_material.use_nodes = True @@ -149,11 +149,11 @@ def createnodes(objekti,texcoat): #luo nodes palikat ja linkittaa tekstuurit nii bpy.ops.object.editmode_toggle() #HACKKI joka saa tekstuurit nakymaan heti bpy.ops.object.editmode_toggle() - - + + def matlab(mat_list, objekti, scene,is_new): #checkmaterial(mat_list, objekti) readtexturefolder(objekti,is_new) - + return('FINISHED') |