diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-12-26 12:36:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-12-26 12:36:50 +0300 |
commit | 944a4f2a3ff300e30c79e7f87a22d0960fc44f95 (patch) | |
tree | 7db58cdf5f4a83066a6c7e087c0bd59fd03dbb57 /release/scripts/op | |
parent | ffe13aeb232ac6bad3a98997b4a352f434293193 (diff) |
pep8 edits, removed MakeCursor.py and rna_array.py, not important to make pep8
Diffstat (limited to 'release/scripts/op')
-rw-r--r-- | release/scripts/op/add_armature_human.py | 4 | ||||
-rw-r--r-- | release/scripts/op/screen_play_rendered_anim.py | 51 | ||||
-rw-r--r-- | release/scripts/op/uvcalc_smart_project.py | 2 | ||||
-rw-r--r-- | release/scripts/op/vertexpaint_dirt.py | 9 |
4 files changed, 36 insertions, 30 deletions
diff --git a/release/scripts/op/add_armature_human.py b/release/scripts/op/add_armature_human.py index e618ed51ee5..afc3c8bd065 100644 --- a/release/scripts/op/add_armature_human.py +++ b/release/scripts/op/add_armature_human.py @@ -23,6 +23,7 @@ from math import cos, sin, pi # could this be stored elsewhere? + def metarig_template(): # generated by rigify.write_meta_rig bpy.ops.object.mode_set(mode='EDIT') @@ -613,7 +614,8 @@ class AddHuman(bpy.types.Operator): bpy.types.register(AddHuman) # Add to a menu -menu_func = (lambda self, context: self.layout.operator(AddHuman.bl_idname, icon='OUTLINER_OB_ARMATURE', text="Human (Meta-Rig)")) +menu_func = (lambda self, context: self.layout.operator(AddHuman.bl_idname, + icon='OUTLINER_OB_ARMATURE', text="Human (Meta-Rig)")) bpy.types.INFO_MT_armature_add.append(menu_func) diff --git a/release/scripts/op/screen_play_rendered_anim.py b/release/scripts/op/screen_play_rendered_anim.py index 40173879787..a8c97010cce 100644 --- a/release/scripts/op/screen_play_rendered_anim.py +++ b/release/scripts/op/screen_play_rendered_anim.py @@ -17,37 +17,40 @@ # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # ***** END GPL LICENCE BLOCK ***** -# -------------------------------------------------------------------------- + +# <pep8 compliant> # History # # Originally written by Matt Ebb import bpy -import subprocess, os, platform +import subprocess +import os +import platform # from BKE_add_image_extension() img_format_exts = { - 'IRIS':'.rgb', - 'RADHDR':'.hdr', - 'PNG':'png', - 'TARGA':'tga', - 'RAWTARGA':'tga', - 'BMP':'bmp', - 'TIFF':'tif', - 'OPENEXR':'exr', - 'MULTILAYER':'exr', - 'CINEON':'cin', - 'DPX':'dpx', - 'JPEG':'jpg', - 'JPEG2000':'jp2', - 'QUICKTIME_QTKIT':'mov', - 'QUICKTIME_CARBON':'mov', - 'AVIRAW':'avi', - 'AVIJPEG':'avi', - 'AVICODEC':'avi', - 'XVID':'avi', - 'THEORA':'ogg', + 'IRIS': '.rgb', + 'RADHDR': '.hdr', + 'PNG': 'png', + 'TARGA': 'tga', + 'RAWTARGA': 'tga', + 'BMP': 'bmp', + 'TIFF': 'tif', + 'OPENEXR': 'exr', + 'MULTILAYER': 'exr', + 'CINEON': 'cin', + 'DPX': 'dpx', + 'JPEG': 'jpg', + 'JPEG2000': 'jp2', + 'QUICKTIME_QTKIT': 'mov', + 'QUICKTIME_CARBON': 'mov', + 'AVIRAW': 'avi', + 'AVIJPEG': 'avi', + 'AVICODEC': 'avi', + 'XVID': 'avi', + 'THEORA': 'ogg', } movie_formats = ('QUICKTIME_QTKIT', @@ -56,8 +59,8 @@ movie_formats = ('QUICKTIME_QTKIT', 'AVIJPEG', 'AVICODEC', 'XVID', - 'THEORA' - ) + 'THEORA') + def guess_player_path(preset): if preset == 'BLENDER24': diff --git a/release/scripts/op/uvcalc_smart_project.py b/release/scripts/op/uvcalc_smart_project.py index 6da6020f85b..0cf2a650973 100644 --- a/release/scripts/op/uvcalc_smart_project.py +++ b/release/scripts/op/uvcalc_smart_project.py @@ -1109,6 +1109,8 @@ def main(context, island_margin, projection_limit): """ from bpy.props import * + + class SmartProject(bpy.types.Operator): '''This script projection unwraps the selected faces of a mesh. it operates on all selected mesh objects, and can be used unwrap selected faces, or all faces.''' bl_idname = "uv.smart_project" diff --git a/release/scripts/op/vertexpaint_dirt.py b/release/scripts/op/vertexpaint_dirt.py index f029541dbca..5731d08a438 100644 --- a/release/scripts/op/vertexpaint_dirt.py +++ b/release/scripts/op/vertexpaint_dirt.py @@ -158,18 +158,17 @@ class VertexPaintDirt(bpy.types.Operator): dirt_only = BoolProperty(name="Dirt Only", description="Dont calculate cleans for convex areas", default=False) def execute(self, context): - sce = context.scene - ob = context.object + obj = context.object - if not ob or ob.type != 'MESH': + if not obj or obj.type != 'MESH': print('Error, no active mesh object, aborting.') return('CANCELLED',) - me = ob.data + mesh = obj.data t = time.time() - applyVertexDirt(me, self.properties.blur_iterations, self.properties.blur_strength, math.radians(self.properties.dirt_angle), math.radians(self.properties.clean_angle), self.properties.dirt_only) + applyVertexDirt(mesh, self.properties.blur_iterations, self.properties.blur_strength, math.radians(self.properties.dirt_angle), math.radians(self.properties.clean_angle), self.properties.dirt_only) print('Dirt calculated in %.6f' % (time.time() - t)) |