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>2020-01-29 05:51:36 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-01-29 05:51:36 +0300
commit6598f0a25cb0485c6e6fa66964c2d74bf80ff705 (patch)
treea15f2b63048bffbfc4e26a1db0800e2b005d4a29 /oscurart_tools
parent9dde6b34b254a3882a1366023eca9792033f9b6c (diff)
Cleanup: trailing space
Diffstat (limited to 'oscurart_tools')
-rw-r--r--oscurart_tools/__init__.py60
-rw-r--r--oscurart_tools/files/save_incremental.py24
-rw-r--r--oscurart_tools/mesh/apply_linked_meshes.py6
-rw-r--r--oscurart_tools/mesh/flipped_uvs.py8
-rw-r--r--oscurart_tools/mesh/vertex_color_id.py4
-rw-r--r--oscurart_tools/object/search_and_select.py2
-rw-r--r--oscurart_tools/render/batch_maker.py4
-rw-r--r--oscurart_tools/render/material_overrides.py20
-rw-r--r--oscurart_tools/render/render_tokens.py4
9 files changed, 66 insertions, 66 deletions
diff --git a/oscurart_tools/__init__.py b/oscurart_tools/__init__.py
index 22fcc1d3..93eacd55 100644
--- a/oscurart_tools/__init__.py
+++ b/oscurart_tools/__init__.py
@@ -29,7 +29,7 @@ bl_info = {
"wiki_url": "https://www.oscurart.com.ar",
"category": "Object",
}
-
+
import bpy
from bpy.app.handlers import persistent
@@ -67,16 +67,16 @@ from bpy.props import (
# mesh
class VIEW3D_MT_edit_mesh_oscurarttools(Menu):
- bl_label = "OscurartTools"
-
+ bl_label = "OscurartTools"
+
def draw(self, context):
layout = self.layout
-
+
layout.operator("mesh.uv_island_copy")
layout.operator("mesh.uv_island_paste")
layout.operator("mesh.select_doubles")
- layout.separator()
- layout.operator("image.reload_images_osc")
+ layout.separator()
+ layout.operator("image.reload_images_osc")
layout.operator("file.save_incremental_backup")
layout.operator("file.collect_all_images")
layout.operator("file.create_batch_maker_osc")
@@ -87,17 +87,17 @@ def menu_funcMesh(self, context):
# image
class IMAGE_MT_uvs_oscurarttools(Menu):
- bl_label = "OscurartTools"
-
+ bl_label = "OscurartTools"
+
def draw(self, context):
layout = self.layout
-
+
layout.operator("mesh.uv_island_copy")
layout.operator("mesh.uv_island_paste")
layout.operator("mesh.overlap_uv_faces")
- layout.operator("mesh.select_flipped_uvs")
- layout.separator()
- layout.operator("image.reload_images_osc")
+ layout.operator("mesh.select_flipped_uvs")
+ layout.separator()
+ layout.operator("image.reload_images_osc")
layout.operator("file.save_incremental_backup")
layout.operator("file.collect_all_images")
layout.operator("file.create_batch_maker_osc")
@@ -110,19 +110,19 @@ def menu_funcImage(self, context):
# object
class VIEW3D_MT_object_oscurarttools(Menu):
- bl_label = "OscurartTools"
-
+ bl_label = "OscurartTools"
+
def draw(self, context):
layout = self.layout
-
- layout.operator("mesh.vertex_color_mask")
+
+ layout.operator("mesh.vertex_color_mask")
layout.operator("object.distribute_osc")
layout.operator("mesh.remove_modifiers")
layout.operator("object.search_and_select_osc")
layout.operator("object.shape_key_to_objects_osc")
- layout.operator("mesh.apply_linked_meshes")
- layout.separator()
- layout.operator("image.reload_images_osc")
+ layout.operator("mesh.apply_linked_meshes")
+ layout.separator()
+ layout.operator("image.reload_images_osc")
layout.operator("file.save_incremental_backup")
layout.operator("file.collect_all_images")
layout.operator("file.create_batch_maker_osc")
@@ -138,8 +138,8 @@ classes = (
VIEW3D_MT_edit_mesh_oscurarttools,
IMAGE_MT_uvs_oscurarttools,
VIEW3D_MT_object_oscurarttools,
- reload_images.reloadImages,
- overlap_uvs.CopyUvIsland,
+ reload_images.reloadImages,
+ overlap_uvs.CopyUvIsland,
overlap_uvs.PasteUvIsland,
distribute.DistributeOsc,
selection.OSSELECTION_HT_OscSelection,
@@ -163,23 +163,23 @@ classes = (
flipped_uvs.selectFlippedUvs
)
-def register():
+def register():
from bpy.types import Scene
Scene.multimeshedit = StringProperty()
bpy.types.VIEW3D_MT_edit_mesh_context_menu.prepend(menu_funcMesh)
bpy.types.IMAGE_MT_uvs_context_menu.prepend(menu_funcImage)
bpy.types.VIEW3D_MT_object_context_menu.prepend(menu_funcObject)
bpy.app.handlers.render_init.append(render_tokens.replaceTokens)
- bpy.app.handlers.render_cancel.append(render_tokens.restoreTokens)
- bpy.app.handlers.render_complete.append(render_tokens.restoreTokens)
- bpy.app.handlers.render_pre.append(material_overrides.ApplyOverrides)
- bpy.app.handlers.render_cancel.append(material_overrides.RestoreOverrides)
- bpy.app.handlers.render_post.append(material_overrides.RestoreOverrides)
-
+ bpy.app.handlers.render_cancel.append(render_tokens.restoreTokens)
+ bpy.app.handlers.render_complete.append(render_tokens.restoreTokens)
+ bpy.app.handlers.render_pre.append(material_overrides.ApplyOverrides)
+ bpy.app.handlers.render_cancel.append(material_overrides.RestoreOverrides)
+ bpy.app.handlers.render_post.append(material_overrides.RestoreOverrides)
+
from bpy.utils import register_class
for cls in classes:
- register_class(cls)
-
+ register_class(cls)
+
def unregister():
bpy.types.VIEW3D_MT_edit_mesh_context_menu.remove(menu_funcMesh)
diff --git a/oscurart_tools/files/save_incremental.py b/oscurart_tools/files/save_incremental.py
index d655b08e..b10db327 100644
--- a/oscurart_tools/files/save_incremental.py
+++ b/oscurart_tools/files/save_incremental.py
@@ -26,34 +26,34 @@ import os
def saveBkp (self, context):
fileFolder = os.path.dirname(bpy.data.filepath)
versionFolder = os.path.join(fileFolder,"VERSIONS")
-
+
#creo folder
if os.path.exists(versionFolder):
print("existe")
else:
- os.mkdir(versionFolder)
-
+ os.mkdir(versionFolder)
+
#sin version a versionada
- if not bpy.data.filepath.count("_v"):
- filelist = [file for file in os.listdir(versionFolder) if file.count("_v") and not file.count("blend1")]
+ if not bpy.data.filepath.count("_v"):
+ filelist = [file for file in os.listdir(versionFolder) if file.count("_v") and not file.count("blend1")]
filelower = 0
print(filelist)
for file in filelist:
if int(file.split(".")[0][-2:]) > filelower:
- filelower = int(file.split(".")[0][-2:])
+ filelower = int(file.split(".")[0][-2:])
- savepath = "%s/VERSIONS/%s_v%02d.blend" % (os.path.dirname(bpy.data.filepath),bpy.path.basename(bpy.data.filepath).split('.')[0],filelower+1)
- print("Copia versionada guardada.")
+ savepath = "%s/VERSIONS/%s_v%02d.blend" % (os.path.dirname(bpy.data.filepath),bpy.path.basename(bpy.data.filepath).split('.')[0],filelower+1)
+ print("Copia versionada guardada.")
bpy.ops.wm.save_as_mainfile()
- bpy.ops.wm.save_as_mainfile(filepath=savepath, copy=True)
+ bpy.ops.wm.save_as_mainfile(filepath=savepath, copy=True)
- else:
+ else:
#versionada a sin version
if bpy.data.filepath.count("_v"):
filename = "%s/../%s.blend" % (os.path.dirname(bpy.data.filepath),os.path.basename(bpy.data.filepath).rpartition(".")[0].rpartition("_")[0])
print(filename)
- bpy.ops.wm.save_as_mainfile(filepath=filename, copy=True)
+ bpy.ops.wm.save_as_mainfile(filepath=filename, copy=True)
print("Copia sin version guardada.")
@@ -66,5 +66,5 @@ class saveIncrementalBackup (bpy.types.Operator):
def execute(self, context):
saveBkp(self, context)
return {'FINISHED'}
-
+
diff --git a/oscurart_tools/mesh/apply_linked_meshes.py b/oscurart_tools/mesh/apply_linked_meshes.py
index 7615c426..0bd7bf47 100644
--- a/oscurart_tools/mesh/apply_linked_meshes.py
+++ b/oscurart_tools/mesh/apply_linked_meshes.py
@@ -35,7 +35,7 @@ def applyLRTEx(self, context):
actObj.rotation_euler = (0,0,0)
actObj.scale = (1,1,1)
- for ob in linkedObjects:
+ for ob in linkedObjects:
ob.matrix_world = ob.matrix_world @ actObj.matrix_world.inverted()
@@ -53,8 +53,8 @@ class ApplyLRT(bpy.types.Operator):
def execute(self, context):
applyLRTEx(self, context)
return {'FINISHED'}
-
-
+
+
diff --git a/oscurart_tools/mesh/flipped_uvs.py b/oscurart_tools/mesh/flipped_uvs.py
index 3cafea7d..14d1be4c 100644
--- a/oscurart_tools/mesh/flipped_uvs.py
+++ b/oscurart_tools/mesh/flipped_uvs.py
@@ -25,18 +25,18 @@ import bmesh
def defSelectFlippedUvs(self, context):
bm = bmesh.from_edit_mesh(bpy.context.active_object.data)
bpy.context.scene.tool_settings.use_uv_select_sync = True
-
+
uvLayer = bm.loops.layers.uv.verify()
-
+
for face in bm.faces:
sum_edges = 0
-
+
for i in range(3):
uv_A = face.loops[i][uvLayer].uv
uv_B = face.loops[(i+1)%3][uvLayer].uv
sum_edges += uv_B.cross(uv_A)
-
+
if sum_edges > 0:
face.select_set(True)
diff --git a/oscurart_tools/mesh/vertex_color_id.py b/oscurart_tools/mesh/vertex_color_id.py
index 3937366e..2eb9790d 100644
--- a/oscurart_tools/mesh/vertex_color_id.py
+++ b/oscurart_tools/mesh/vertex_color_id.py
@@ -49,8 +49,8 @@ def vertexColorMask(self,context):
for loop in face.loops:
loop[color_layer] = color
bpy.ops.object.mode_set(mode="VERTEX_PAINT")
-
-
+
+
class createVCMask(bpy.types.Operator):
bl_idname = "mesh.vertex_color_mask"
bl_label = "Vertex Color Mask"
diff --git a/oscurart_tools/object/search_and_select.py b/oscurart_tools/object/search_and_select.py
index a576457c..707c7188 100644
--- a/oscurart_tools/object/search_and_select.py
+++ b/oscurart_tools/object/search_and_select.py
@@ -57,6 +57,6 @@ class SearchAndSelectOt(bpy.types.Operator):
self.count = True
self.end = True
return context.window_manager.invoke_props_dialog(self)
-
+
diff --git a/oscurart_tools/render/batch_maker.py b/oscurart_tools/render/batch_maker.py
index 99780aec..fed15dcc 100644
--- a/oscurart_tools/render/batch_maker.py
+++ b/oscurart_tools/render/batch_maker.py
@@ -32,8 +32,8 @@ def batchMaker(BIN):
else:
for scene in bpy.data.scenes:
FILE.writelines("blender -b '%s' --scene %s --python-text Text -a \n" % (bpy.data.filepath,scene.name))
-
-
+
+
class oscBatchMaker (bpy.types.Operator):
"""It creates .bat(win) or .sh(unix) file, to execute and render from Console/Terminal"""
diff --git a/oscurart_tools/render/material_overrides.py b/oscurart_tools/render/material_overrides.py
index 35afc45c..5720d293 100644
--- a/oscurart_tools/render/material_overrides.py
+++ b/oscurart_tools/render/material_overrides.py
@@ -8,31 +8,31 @@ from bpy.app.handlers import persistent
@persistent
def ApplyOverrides(dummy):
- global obDict
+ global obDict
for override in bpy.context.scene.ovlist:
for ob in bpy.data.collections[override.grooverride].all_objects:
if ob.type == "MESH":
if not ob.hide_viewport and not ob.hide_render:
- obDict.append([ob,[mat for mat in ob.data.materials]])
+ obDict.append([ob,[mat for mat in ob.data.materials]])
for override in bpy.context.scene.ovlist:
for ob in bpy.data.collections[override.grooverride].all_objects:
if ob.type == "MESH":
if not ob.hide_viewport and not ob.hide_render:
for i,mat in enumerate(ob.data.materials):
- ob.data.materials[i] = bpy.data.materials[override.matoverride]
+ ob.data.materials[i] = bpy.data.materials[override.matoverride]
@persistent
def RestoreOverrides(dummy):
global obDict
-
+
for set in obDict:
for i,mat in enumerate(set[1]):
set[0].data.materials[i] = mat
-
- obDict = []
+
+ obDict = []
# ---------------------------------------------------
@@ -42,9 +42,9 @@ def RestoreOverrides(dummy):
class OscOverridesProp(bpy.types.PropertyGroup):
matoverride: bpy.props.StringProperty()
grooverride: bpy.props.StringProperty()
-
-bpy.utils.register_class(OscOverridesProp)
-bpy.types.Scene.ovlist = bpy.props.CollectionProperty(type=OscOverridesProp)
+
+bpy.utils.register_class(OscOverridesProp)
+bpy.types.Scene.ovlist = bpy.props.CollectionProperty(type=OscOverridesProp)
class OVERRIDES_PT_OscOverridesGUI(bpy.types.Panel):
@@ -174,5 +174,5 @@ class OscOverridesKill(bpy.types.Operator):
def execute(self, context):
ovlist = context.scene.ovlist
ovlist.remove(self.index)
- return {'FINISHED'}
+ return {'FINISHED'}
diff --git a/oscurart_tools/render/render_tokens.py b/oscurart_tools/render/render_tokens.py
index 0d77f8d0..2ac8404e 100644
--- a/oscurart_tools/render/render_tokens.py
+++ b/oscurart_tools/render/render_tokens.py
@@ -30,9 +30,9 @@ def replaceTokens (dummy):
"$File":os.path.basename(bpy.data.filepath).split(".")[0],
"$ViewLayer":bpy.context.view_layer.name,
"$Camera":bpy.context.scene.camera.name}
-
+
renpath = bpy.context.scene.render.filepath
-
+
bpy.context.scene.render.filepath = renpath.replace("$Scene",tokens["$Scene"]).replace("$File",tokens["$File"]).replace("$ViewLayer",tokens["$ViewLayer"]).replace("$Camera",tokens["$Camera"])
print(bpy.context.scene.render.filepath)