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:
authorCampbell Barton <ideasman42@gmail.com>2021-01-25 04:33:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-01-25 04:33:59 +0300
commit425a3f6a705beab849cab36d2ca2ae43726d700f (patch)
tree00802f0b1efac9d9fc8b7b4062ab5349ca90722d /io_coat3D
parent3c6e9c26bc6b35399dfbc38c3116b1375fa6f53c (diff)
Cleanup: strip trailing space
Diffstat (limited to 'io_coat3D')
-rw-r--r--io_coat3D/__init__.py76
-rw-r--r--io_coat3D/folders.py32
-rw-r--r--io_coat3D/tex.py44
-rw-r--r--io_coat3D/updateimage.py2
4 files changed, 77 insertions, 77 deletions
diff --git a/io_coat3D/__init__.py b/io_coat3D/__init__.py
index 28e8f711..0a40a6d0 100644
--- a/io_coat3D/__init__.py
+++ b/io_coat3D/__init__.py
@@ -78,7 +78,7 @@ def every_3_seconds():
if(only_one_time):
only_one_time = False
folders.loadExchangeFolder()
-
+
try:
coat3D = bpy.context.scene.coat3D
@@ -96,7 +96,7 @@ def every_3_seconds():
except:
pass
-
+
return 3.0
@persistent
@@ -207,10 +207,10 @@ def updatemesh(objekti, proxy, texturelist):
if(udim_textures):
udim = proxy.data.uv_layers[index].name
udim_index = int(udim[2:]) - 1
-
+
objekti.data.uv_layers[0].data[indi].uv[0] = proxy.data.uv_layers[index].data[indi].uv[0]
objekti.data.uv_layers[0].data[indi].uv[1] = proxy.data.uv_layers[index].data[indi].uv[1]
-
+
index = index + 1
# Mesh Copy
@@ -225,9 +225,9 @@ class SCENE_OT_getback(bpy.types.Operator):
bl_label = "Export your custom property"
bl_description = "Export your custom property"
bl_options = {'UNDO'}
-
+
def invoke(self, context, event):
-
+
global global_exchange_folder
path_ex = ''
@@ -236,23 +236,23 @@ class SCENE_OT_getback(bpy.types.Operator):
BlenderFolder = Blender_folder
ExportFolder = Export_folder
-
+
Blender_folder += ('%sexport.txt' % (os.sep))
Export_folder += ('%sexport.txt' % (os.sep))
-
+
if (bpy.app.background == False):
if os.path.isfile(Export_folder):
-
+
print('BLENDER -> 3DC -> BLENDER WORKFLLOW')
- DeleteExtra3DC()
+ DeleteExtra3DC()
workflow1(ExportFolder)
removeFile(Export_folder)
- removeFile(Blender_folder)
-
+ removeFile(Blender_folder)
+
elif os.path.isfile(Blender_folder):
print('3DC -> BLENDER WORKFLLOW')
- DeleteExtra3DC()
+ DeleteExtra3DC()
workflow2(BlenderFolder)
removeFile(Blender_folder)
@@ -263,23 +263,23 @@ class SCENE_OT_savenew(bpy.types.Operator):
bl_label = "Export your custom property"
bl_description = "Export your custom property"
bl_options = {'UNDO'}
-
+
def invoke(self, context, event):
-
+
coat3D = bpy.context.scene.coat3D
platform = os.sys.platform
-
+
if(platform == 'win32' or platform == 'darwin'):
exchangeFile = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3DC2Blender' + os.sep + 'Exchange_folder.txt'
else:
exchangeFile = os.path.expanduser("~") + os.sep + '3DC2Blender' + os.sep + 'Exchange_folder.txt'
if(os.path.isfile(exchangeFile)):
folderPath = ''
-
+
if(os.path.isfile(exchangeFile)):
file = open(exchangeFile, "w")
file.write("%s"%(coat3D.exchangeFolder))
- file.close()
+ file.close()
return {'FINISHED'}
@@ -331,7 +331,7 @@ class SCENE_OT_opencoat(bpy.types.Operator):
def scaleParents():
save = []
names =[]
-
+
for objekti in bpy.context.selected_objects:
temp = objekti
while (temp.parent is not None and temp.parent.name not in names):
@@ -527,7 +527,7 @@ class SCENE_OT_export(bpy.types.Operator):
def invoke(self, context, event):
bpy.ops.export_applink.pilgway_3d_coat()
-
+
return {'FINISHED'}
def execute(self, context):
@@ -548,7 +548,7 @@ class SCENE_OT_export(bpy.types.Operator):
export_ok = False
coat3D = bpy.context.scene.coat3D
-
+
if (bpy.context.selected_objects == []):
return {'FINISHED'}
else:
@@ -574,11 +574,11 @@ class SCENE_OT_export(bpy.types.Operator):
if (os.path.isfile(Blender_folder2)):
os.remove(Blender_folder2)
-
+
if (not os.path.isdir(coat3D.exchangeFolder)):
coat3D.exchange_found = False
return {'FINISHED'}
-
+
folder_objects = folders.set_working_folders()
folder_size(folder_objects)
@@ -735,7 +735,7 @@ class SCENE_OT_export(bpy.types.Operator):
bpy.data.images.remove(image)
index_bake_tex += 1
-
+
#BAKING ENDS
#bpy.ops.object.origin_set(type='ORIGIN_GEOMETRY')
@@ -789,7 +789,7 @@ class SCENE_OT_export(bpy.types.Operator):
if(node.name.startswith('3DC_') == True):
material.material.node_tree.nodes.remove(node)
-
+
for ind, mat_list in enumerate(mod_mat_list):
if(mat_list == '__' + objekti.name):
for ind, mat in enumerate(mod_mat_list[mat_list]):
@@ -822,7 +822,7 @@ def DeleteExtra3DC():
bpy.data.images.remove(del_img)
bpy.data.materials.remove(material)
-
+
image_del_list = []
for image in bpy.data.images:
if (image.name.startswith('3DC')):
@@ -901,7 +901,7 @@ def new_ref_function(new_applink_address, nimi):
def blender_3DC_blender(texturelist, file_applink_address):
-
+
coat3D = bpy.context.scene.coat3D
old_materials = bpy.data.materials.keys()
@@ -915,7 +915,7 @@ def blender_3DC_blender(texturelist, file_applink_address):
for objekti in bpy.data.objects:
if objekti.type == 'MESH' and objekti.coat3D.applink_address == file_applink_address:
obj_coat = objekti.coat3D
-
+
object_list.append(objekti.name)
if(os.path.isfile(obj_coat.applink_address)):
if (obj_coat.objecttime != str(os.path.getmtime(obj_coat.applink_address))):
@@ -1050,7 +1050,7 @@ def blender_3DC_blender(texturelist, file_applink_address):
#delete_materials_from_end(keep_materials_count, obj_proxy)
-
+
updatemesh(objekti,obj_proxy, texturelist)
bpy.context.view_layer.objects.active = objekti
@@ -1178,7 +1178,7 @@ def blender_3DC(texturelist, new_applink_address):
old_materials = bpy.data.materials.keys()
old_objects = bpy.data.objects.keys()
-
+
bpy.ops.import_scene.fbx(filepath=new_applink_address, global_scale = 1, axis_forward='-Z', axis_up='Y')
new_materials = bpy.data.materials.keys()
@@ -1253,7 +1253,7 @@ def blender_3DC(texturelist, new_applink_address):
os.remove(Blender_export)
if (os.path.isfile(Blender_folder2)):
os.remove(Blender_folder2)
-
+
for material in bpy.data.materials:
if material.use_nodes == True:
for node in material.node_tree.nodes:
@@ -1271,9 +1271,9 @@ def workflow1(ExportFolder):
for image in bpy.data.images:
if(image.filepath == texturepath[3] and image.users == 0):
bpy.data.images.remove(image)
-
+
path3b_now = coat3D.exchangeFolder
-
+
path3b_now += ('last_saved_3b_file.txt')
new_applink_address = 'False'
new_object = False
@@ -1297,7 +1297,7 @@ def workflow1(ExportFolder):
new_ref_object = True
nimi = scene_objects.name
-
+
exportfile = coat3D.exchangeFolder
@@ -1327,9 +1327,9 @@ def workflow2(BlenderFolder):
kokeilu = coat3D.exchangeFolder
Blender_export = os.path.join(kokeilu, 'Blender')
-
+
path3b_now = coat3D.exchangeFolder
-
+
path3b_now += ('last_saved_3b_file.txt')
Blender_export += ('%sexport.txt'%(os.sep))
new_applink_address = 'False'
@@ -2007,7 +2007,7 @@ def register():
default=True
)
-
+
from bpy.utils import register_class
@@ -2017,7 +2017,7 @@ def register():
bpy.types.Object.coat3D = PointerProperty(type=ObjectCoat3D)
bpy.types.Scene.coat3D = PointerProperty(type=SceneCoat3D)
bpy.types.Mesh.coat3D = PointerProperty(type=MeshCoat3D)
- bpy.types.Material.coat3D = PointerProperty(type=MaterialCoat3D)
+ bpy.types.Material.coat3D = PointerProperty(type=MaterialCoat3D)
bpy.app.handlers.load_post.append(load_handler)
kc = bpy.context.window_manager.keyconfigs.addon
diff --git a/io_coat3D/folders.py b/io_coat3D/folders.py
index ad54bf71..ed348cfa 100644
--- a/io_coat3D/folders.py
+++ b/io_coat3D/folders.py
@@ -9,33 +9,33 @@ def InitFolders():
# Global variable foundExchangeFolder (True / False) guides these steps
# 1. Read Exchange_folder.txt, if not success ->
# 2. Try to find exchange folder from system hard drive, if not success -->
- # 3. Leave foundExchangeFolder = False
+ # 3. Leave foundExchangeFolder = False
# 1. #################################################################
if(platform == 'win32' or platform == 'darwin'):
- DC2Folder = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3DC2Blender'
+ DC2Folder = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3DC2Blender'
else:
- DC2Folder = os.path.expanduser("~") + os.sep + '3DC2Blender'
-
+ DC2Folder = os.path.expanduser("~") + os.sep + '3DC2Blender'
+
exchangeFile = DC2Folder + os.sep + 'Exchange_folder.txt'
if(not os.path.isdir(DC2Folder)):
os.mkdir(DC2Folder)
-
+
if(not os.path.isfile(exchangeFile)):
file = open(exchangeFile, 'w')
file.close()
else:
savedExchangePath = ''
folderPath = open(exchangeFile)
-
+
for line in folderPath:
savedExchangePath = line
break
folderPath.close()
-
+
coat3D.exchangeFolder = savedExchangePath
return True, coat3D.exchangeFolder
@@ -50,7 +50,7 @@ def InitFolders():
exchangeFolder = os.path.expanduser("~") + os.sep + '3D-CoatV3' + os.sep + 'Exchange'
if(os.path.isdir(exchangeFolder)):
coat3D.exchangeFolder = exchangeFolder
-
+
Blender_folder = ("%s%sBlender"%(exchangeFolder,os.sep))
if(not(os.path.isdir(Blender_folder))):
@@ -68,7 +68,7 @@ def InitFolders():
file = open(Blender_folder3, "w")
file.write("Blender Cycles")
file.close()
-
+
file = open(exchangeFile, "w")
file.write("%s"%(os.path.abspath(coat3D.exchangeFolder)))
file.close()
@@ -81,14 +81,14 @@ def InitFolders():
def updateExchangeFile(newPath):
platform = os.sys.platform
-
+
if(platform == 'win32' or platform == 'darwin'):
exchangeFile = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3DC2Blender' + os.sep + 'Exchange_folder.txt'
else:
exchangeFile = os.path.expanduser("~") + os.sep + '3DC2Blender' + os.sep + 'Exchange_folder.txt'
if(os.path.isfile(exchangeFile)):
folderPath = ''
-
+
if(os.path.isfile(exchangeFile)):
file = open(exchangeFile, "w")
file.write("%s"%(newPath))
@@ -100,22 +100,22 @@ def loadExchangeFolder():
coat3D = bpy.context.scene.coat3D
if(platform == 'win32' or platform == 'darwin'):
- DC2Folder = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3DC2Blender'
+ DC2Folder = os.path.expanduser("~") + os.sep + 'Documents' + os.sep + '3DC2Blender'
else:
- DC2Folder = os.path.expanduser("~") + os.sep + '3DC2Blender'
-
+ DC2Folder = os.path.expanduser("~") + os.sep + '3DC2Blender'
+
exchangeFile = DC2Folder + os.sep + 'Exchange_folder.txt'
if(not os.path.isdir(DC2Folder)):
os.mkdir(DC2Folder)
-
+
if(not os.path.isfile(exchangeFile)):
file = open(exchangeFile, 'w')
file.close()
else:
savedExchangePath = ''
folderPath = open(exchangeFile)
-
+
for line in folderPath:
savedExchangePath = line
break
diff --git a/io_coat3D/tex.py b/io_coat3D/tex.py
index c46275be..9901e3b2 100644
--- a/io_coat3D/tex.py
+++ b/io_coat3D/tex.py
@@ -73,22 +73,22 @@ def updatetextures(objekti): # Update 3DC textures
def testi(objekti, texture_info, index_mat_name, uv_MODE_mat, mat_index):
if uv_MODE_mat == 'UV':
-
+
uv_set_founded = False
for uvset in objekti.data.uv_layers:
-
+
if(uvset.name == texture_info):
uv_set_founded = True
-
+
break
-
+
if(uv_set_founded):
for uv_poly in objekti.data.uv_layers[texture_info].id_data.polygons:
if(mat_index == uv_poly.material_index):
return True
else:
return False
-
+
elif uv_MODE_mat == 'MAT':
return (texture_info == index_mat_name)
@@ -113,18 +113,18 @@ def readtexturefolder(objekti, mat_list, texturelist, is_new, udim_textures, udi
if(udim_textures == False):
for slot_index, texture_info in enumerate(texturelist):
- uv_MODE_mat = 'MAT'
+ uv_MODE_mat = 'MAT'
for index, layer in enumerate(objekti.data.uv_layers):
if(layer.name == texturelist[slot_index][0]):
uv_MODE_mat = 'UV'
break
-
+
if(testi(objekti, texturelist[slot_index][0], index_mat.name, uv_MODE_mat, ind)) :
if (os.path.isfile(texture_info[3])):
if texture_info[2] == 'color' or texture_info[2] == 'diffuse':
if(index_mat.material.coat3D_diffuse):
-
+
texcoat['color'].append(texture_info[3])
create_nodes = True
else:
@@ -187,7 +187,7 @@ def readtexturefolder(objekti, mat_list, texturelist, is_new, udim_textures, udi
os.remove(texture_info[3])
create_group_node = True
-
+
else:
for texture_info in texturelist:
@@ -281,8 +281,8 @@ def createnodes(active_mat,texcoat, create_group_node, objekti, ind, is_new, udi
act_material = node.node_tree
applink_tree = node
break
-
-
+
+
for node in act_material.nodes:
if (node.type != 'GROUP'):
if (node.type != 'GROUP_OUTPUT'):
@@ -312,7 +312,7 @@ def createnodes(active_mat,texcoat, create_group_node, objekti, ind, is_new, udi
bring_alpha = False
updateimage.update(texcoat, 'alpha', node, udim_textures, udim_len)
-
+
elif (node.type == 'GROUP' and node.name.startswith('3DC_')):
if (node.name == '3DC_color'):
bring_color = False
@@ -481,12 +481,12 @@ def CreateTextureLine(type, act_material, main_mat, texcoat, coat3D, notegroup,
load_image = True
for image in bpy.data.images:
-
+
if(os.path.normpath(texcoat[type['name']][0]) == os.path.normpath(image.filepath)):
load_image = False
node.image = image
-
+
if(udim_textures):
node.image.source = 'TILED'
for udim_index in udim_len:
@@ -494,7 +494,7 @@ def CreateTextureLine(type, act_material, main_mat, texcoat, coat3D, notegroup,
node.image.tiles.new(udim_index)
node.image.reload()
-
+
break
if (load_image):
@@ -508,7 +508,7 @@ def CreateTextureLine(type, act_material, main_mat, texcoat, coat3D, notegroup,
if (udim_index != 1001):
node.image.tiles.new(udim_index)
-
+
if node.image and type['colorspace'] == 'noncolor':
node.image.colorspace_settings.is_data = True
@@ -567,7 +567,7 @@ def CreateTextureLine(type, act_material, main_mat, texcoat, coat3D, notegroup,
if(material.name == '3DC_Emission'):
main_material.links.new(applink_tree.outputs[type['input']], material.inputs[0])
break
-
+
uv_node.location = node.location
uv_node.location[0] -= 300
uv_node.location[1] -= 200
@@ -660,19 +660,19 @@ def matlab(objekti,mat_list,texturelist,is_new):
if(is_new):
RemoveFbxNodes(objekti)
- updatetextures(objekti)
+ updatetextures(objekti)
- # Count udim tiles
+ # Count udim tiles
if(texturelist != []):
-
+
udim_textures = False
udim_count = 0
udim_indexs = []
if texturelist[0][0].startswith('10') and len(texturelist[0][0]) == 4:
udim_textures = True
-
+
udim_target = ''
udim_target = texturelist[0][2]
for texture in texturelist:
@@ -680,7 +680,7 @@ def matlab(objekti,mat_list,texturelist,is_new):
udim_indexs.append(int(texture[0]))
udim_indexs.sort() # sort tiles list -> 1001, 1002, 1003...
-
+
# Main loop for creating nodes
readtexturefolder(objekti, mat_list, texturelist, is_new, udim_textures, udim_indexs)
diff --git a/io_coat3D/updateimage.py b/io_coat3D/updateimage.py
index c811d770..2b967fd7 100644
--- a/io_coat3D/updateimage.py
+++ b/io_coat3D/updateimage.py
@@ -2,7 +2,7 @@ import bpy
import os
def update(texcoat,tex_type,node, udim_textures, udim_len):
-
+
if (os.path.normpath(texcoat[tex_type][0]) != os.path.normpath(node.image.filepath)):
tex_found = False