[Bf-extensions-cvs] [aec5a36c] master: Cleanup: tabs -> spaces
Campbell Barton
noreply at git.blender.org
Thu Mar 5 02:33:05 CET 2020
Commit: aec5a36c12a3ec1d068adb8270017e509087dff6
Author: Campbell Barton
Date: Thu Mar 5 12:32:28 2020 +1100
Branches: master
https://developer.blender.org/rBAaec5a36c12a3ec1d068adb8270017e509087dff6
Cleanup: tabs -> spaces
===================================================================
M add_mesh_BoltFactory/__init__.py
M archipack/archipack_gl.py
M archipack/archipack_keymaps.py
M blenderkit/bg_blender.py
M blenderkit/colors.py
M blenderkit/oauth.py
M blenderkit/tasks_queue.py
M blenderkit/utils.py
M btrace/bTrace_props.py
M io_export_dxf/model/dxfLibrary.py
M io_export_dxf/model/model.py
M io_export_dxf/test2.txt
M io_mesh_atomic/utility_gui.py
M io_mesh_uv_layout/export_uv_eps.py
M io_mesh_uv_layout/export_uv_svg.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_drivers.py
M io_scene_gltf2/blender/imp/gltf2_blender_scene.py
M magic_uv/lib/bglx.py
M materials_library_vx/categories.txt
M mesh_inset/__init__.py
M mesh_snap_utilities_line/snap_context_l/utils_projection.py
M mesh_tools/mesh_offset_edges.py
M node_arrange.py
M object_carver/__init__.py
M object_carver/carver_draw.py
M object_carver/carver_operator.py
M object_carver/carver_preferences.py
M object_carver/carver_profils.py
M object_carver/carver_utils.py
M object_collection_manager/internals.py
M oscurart_tools/files/reload_images.py
M oscurart_tools/files/save_incremental.py
M oscurart_tools/mesh/apply_linked_meshes.py
M oscurart_tools/mesh/flipped_uvs.py
M oscurart_tools/mesh/overlap_island.py
M oscurart_tools/mesh/overlap_uvs.py
M oscurart_tools/mesh/remove_modifiers.py
M oscurart_tools/mesh/select_doubles.py
M oscurart_tools/mesh/vertex_color_id.py
M oscurart_tools/object/distribute.py
M oscurart_tools/object/search_and_select.py
M oscurart_tools/render/batch_maker.py
M oscurart_tools/render/material_overrides.py
M power_sequencer/scripts/BPSRender/bpsrender/__init__.py
M presets/pov/light/17_(1700K)_135W_Low_Pressure_Sodium.py
M presets/pov/world/4_Cartoony_Sky.py
M presets/pov/world/5_Under_Water.py
M rigify/base_generate.py
M rigify/rot_mode.py
M rigify/utils/metaclass.py
M space_view3d_math_vis/draw.py
M space_view3d_pie_menus/pie_origin.py
M space_view3d_spacebar_menu/__init__.py
M space_view3d_spacebar_menu/edit_mesh.py
M space_view3d_spacebar_menu/snap_origin_cursor.py
M space_view3d_stored_views/io.py
M space_view3d_stored_views/operators.py
M space_view3d_stored_views/properties.py
M sun_position/geo.py
===================================================================
diff --git a/add_mesh_BoltFactory/__init__.py b/add_mesh_BoltFactory/__init__.py
index 1a765908..d763d13f 100644
--- a/add_mesh_BoltFactory/__init__.py
+++ b/add_mesh_BoltFactory/__init__.py
@@ -45,7 +45,7 @@ import bpy
def register():
- Boltfactory.register()
+ Boltfactory.register()
diff --git a/archipack/archipack_gl.py b/archipack/archipack_gl.py
index f3ef034a..f0bf8482 100644
--- a/archipack/archipack_gl.py
+++ b/archipack/archipack_gl.py
@@ -85,7 +85,7 @@ in vec2 pos;
void main()
{
- gl_Position = ModelViewProjectionMatrix * vec4(pos, 0.0, 1.0);
+ gl_Position = ModelViewProjectionMatrix * vec4(pos, 0.0, 1.0);
}
'''
@@ -97,7 +97,7 @@ out vec4 fragColor;
void main()
{
- fragColor = color;
+ fragColor = color;
}
'''
diff --git a/archipack/archipack_keymaps.py b/archipack/archipack_keymaps.py
index f5b95957..05458b9c 100644
--- a/archipack/archipack_keymaps.py
+++ b/archipack/archipack_keymaps.py
@@ -119,4 +119,4 @@ class Keymaps:
k.alt, k.ctrl, k.shift, k.type, k.value, sub, k.name)
file = open(filename, "w")
file.write(str)
- file.close()
\ No newline at end of file
+ file.close()
diff --git a/blenderkit/bg_blender.py b/blenderkit/bg_blender.py
index e8ccb04d..8a37f6ce 100644
--- a/blenderkit/bg_blender.py
+++ b/blenderkit/bg_blender.py
@@ -239,4 +239,3 @@ def unregister():
bpy.utils.unregister_class(KillBgProcess)
if bpy.app.timers.is_registered(bg_update):
bpy.app.timers.unregister(bg_update)
-
diff --git a/blenderkit/colors.py b/blenderkit/colors.py
index d01bdb0a..c61d9fa0 100644
--- a/blenderkit/colors.py
+++ b/blenderkit/colors.py
@@ -20,4 +20,4 @@
TEXT = (.9, .9, .9, .6)
GREEN = (.9, 1, .9, .6)
-RED = (1, .5, .5, .8)
\ No newline at end of file
+RED = (1, .5, .5, .8)
diff --git a/blenderkit/oauth.py b/blenderkit/oauth.py
index 95c6bae6..06e57298 100644
--- a/blenderkit/oauth.py
+++ b/blenderkit/oauth.py
@@ -104,4 +104,4 @@ class SimpleOAuthAuthenticator(object):
return self._get_tokens(authorization_code=authorization_code)
def get_refreshed_token(self, refresh_token):
- return self._get_tokens(refresh_token=refresh_token, grant_type="refresh_token")
\ No newline at end of file
+ return self._get_tokens(refresh_token=refresh_token, grant_type="refresh_token")
diff --git a/blenderkit/tasks_queue.py b/blenderkit/tasks_queue.py
index 95ffb1a6..4f500bbf 100644
--- a/blenderkit/tasks_queue.py
+++ b/blenderkit/tasks_queue.py
@@ -103,5 +103,3 @@ def register():
def unregister():
bpy.app.handlers.load_post.remove(scene_load)
-
-
diff --git a/blenderkit/utils.py b/blenderkit/utils.py
index fe80e1a0..b9bd17f1 100644
--- a/blenderkit/utils.py
+++ b/blenderkit/utils.py
@@ -558,4 +558,4 @@ def guard_from_crash():
return False;
if bpy.context.preferences.addons['blenderkit'].preferences is None:
return False;
- return True
\ No newline at end of file
+ return True
diff --git a/btrace/bTrace_props.py b/btrace/bTrace_props.py
index 4476e0f6..b7e824c8 100644
--- a/btrace/bTrace_props.py
+++ b/btrace/bTrace_props.py
@@ -565,5 +565,3 @@ class TracerProperties(PropertyGroup):
description="",
default='tool_help'
)
-
-
diff --git a/io_export_dxf/model/dxfLibrary.py b/io_export_dxf/model/dxfLibrary.py
index 2dffaabe..50aa4d56 100644
--- a/io_export_dxf/model/dxfLibrary.py
+++ b/io_export_dxf/model/dxfLibrary.py
@@ -89,94 +89,94 @@ ______________________________________________________________
#import BPyMessages
try:
- import copy
- #from struct import pack
+ import copy
+ #from struct import pack
except:
- copy = None
+ copy = None
####1) Private (only for developers)
_HEADER_POINTS=['insbase','extmin','extmax']
#---helper functions-----------------------------------
def _point(x,index=0):
- """Convert tuple to a dxf point"""
- return '\n'.join([' %s\n%s'%((i+1)*10+index,float(x[i])) for i in range(len(x))])
+ """Convert tuple to a dxf point"""
+ return '\n'.join([' %s\n%s'%((i+1)*10+index,float(x[i])) for i in range(len(x))])
def _points(plist):
- """Convert a list of tuples to dxf points"""
- out = '\n'.join([_point(plist[i],i)for i in range(len(plist))])
- return out
+ """Convert a list of tuples to dxf points"""
+ out = '\n'.join([_point(plist[i],i)for i in range(len(plist))])
+ return out
#---base classes----------------------------------------
class _Call:
- """Makes a callable class."""
- def copy(self):
- """Returns a copy."""
- return copy.deepcopy(self)
+ """Makes a callable class."""
+ def copy(self):
+ """Returns a copy."""
+ return copy.deepcopy(self)
- def __call__(self,**attrs):
- """Returns a copy with modified attributes."""
- copied=self.copy()
- for attr in attrs:setattr(copied,attr,attrs[attr])
- return copied
+ def __call__(self,**attrs):
+ """Returns a copy with modified attributes."""
+ copied=self.copy()
+ for attr in attrs:setattr(copied,attr,attrs[attr])
+ return copied
#-------------------------------------------------------
class _Entity(_Call):
- """Base class for _common group codes for entities."""
- def __init__(self,paperspace=None,color=None,layer='0',
- lineType=None,lineTypeScale=None,lineWeight=None,
- extrusion=None,elevation=None,thickness=None,
- parent=None):
- """None values will be omitted."""
- self.paperspace = paperspace
- self.color = color
- self.layer = layer
- self.lineType = lineType
- self.lineTypeScale = lineTypeScale
- self.lineWeight = lineWeight
- self.extrusion = extrusion
- self.elevation = elevation
- self.thickness = thickness
- #self.visible = visible
- self.parent = parent
-
- def _common(self):
- """Return common group codes as a string."""
- if self.parent:parent=self.parent
- else:parent=self
- result =''
- if parent.paperspace==1: result+=' 67\n1\n'
- if parent.layer!=None: result+=' 8\n%s\n'%parent.layer
- if parent.color!=None: result+=' 62\n%s\n'%parent.color
- if parent.lineType!=None: result+=' 6\n%s\n'%parent.lineType
- # TODO: if parent.lineWeight!=None: result+='370\n%s\n'%parent.lineWeight
- # TODO: if parent.visible!=None: result+='60\n%s\n'%parent.visible
- if parent.lineTypeScale!=None: result+=' 48\n%s\n'%parent.lineTypeScale
- if parent.elevation!=None: result+=' 38\n%s\n'%parent.elevation
- if parent.thickness!=None: result+=' 39\n%s\n'%parent.thickness
- if parent.extrusion!=None: result+='%s\n'%_point(parent.extrusion,200)
- return result
+ """Base class for _common group codes for entities."""
+ def __init__(self,paperspace=None,color=None,layer='0',
+ lineType=None,lineTypeScale=None,lineWeight=None,
+ extrusion=None,elevation=None,thickness=None,
+ parent=None):
+ """None values will be omitted."""
+ self.paperspace = paperspace
+ self.color = color
+ self.layer = layer
+ self.lineType = lineType
+ self.lineTypeScale = lineTypeScale
+ self.lineWeight = lineWeight
+ self.extrusion = extrusion
+ self.elevation = elevation
+ self.thickness = thickness
+ #self.visible = visible
+ self.parent = parent
+
+ def _common(self):
+ """Return common group codes as a string."""
+ if self.parent:parent=self.parent
+ else:parent=self
+ result =''
+ if parent.paperspace==1: result+=' 67\n1\n'
+ if parent.layer!=None: result+=' 8\n%s\n'%parent.layer
+ if parent.color!=None: result+=' 62\n%s\n'%parent.color
+ if parent.lineType!=None: result+=' 6\n%s\n'%parent.lineType
+ # TODO: if parent.lineWeight!=None: result+='370\n%s\n'%parent.lineWeight
+ # TODO: if parent.visible!=None: result+='60\n%s\n'%parent.visible
+ if parent.lineTypeScale!=None: result+=' 48\n%s\n'%parent.lineTypeScale
+ if parent.elevation!=None: result+=' 38\n%s\n'%parent.elevation
+ if parent.thickness!=None: result+=' 39\n%s\n'%parent.thickness
+ if parent.extrusion!=None: result+='%s\n'%_point(parent.extrusion,200)
+ return result
#--------------------------
class _Entities:
- """Base class to deal with composed objects."""
- def __dxf__(self):
- return []
+ """Base class to deal with composed objects."""
+ def __dxf__(self):
+ return []
- def __str__(self):
- return ''.join([str(x) for x in self.__dxf__()])
+ def __str__(self):
+ return ''.join([str(x) for x in self.__dxf__()])
#--------------------------
class _Collection(_Call):
- """Base class to expose entities methods to main object."""
- def __init__(self,entities=[]):
- self.entities=copy.copy(entities)
- #link entities methods to drawing
- for attr in dir(self.entities):
- if attr[0]!='_':
- attrObject=getattr(self.entities,attr)
- if callable(attrObject):
- setattr(self,attr,attrObject)
+ """Base class to expose entities methods to main object."""
+ def __init__(self,entities=[]):
+ self.entities=copy.copy(entities)
+ #link entities methods to drawing
+ for attr in dir(self.entities):
+ if attr[0]!='_':
+ attrObject=getattr(self.entities,attr)
+ if callable(attrObject):
+ setattr(self,attr,attrObject)
####2) Constants
#---color values
@@ -199,7 +199,7 @@ TOP_CENTER = 2
TOP_RIGHT = 3
MIDDLE_LEFT = 4
MIDDLE_CENTER = 5
-MIDDLE_RIGHT = 6
+MIDDLE_RIGHT = 6
BOTTOM_LEFT = 7
BOTTOM_CENTER = 8
BOTTOM_RIGHT = 9
@@ -212,14 +212,14 @@ AT_LEAST = 1 #taller characters will override
EXACT = 2 #taller characters will not override
#---polyline flag 70
-CLOSED =1 # This is a closed polyline (or a polygon mesh closed in the M direction)
-CURVE_FIT =2 # Curve-fit vertices have been added
-SPLINE_FIT =4 # Spline-fit vertices have been added
-POLYLINE_3D =8 # This is a 3D polyline
-POLYGON_MESH =16 # This is a 3D polygon mesh
-CLOSED_N =32 # The polygon mesh is closed in the N direction
-POLYFACE_MESH =64 # The polyline is a polyface mesh
-CONTINO
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list