forked from bartvdbraak/blender
pep8 edits
This commit is contained in:
parent
418d66242f
commit
c99975e24f
@ -38,6 +38,7 @@ class DataPathBuilder(object):
|
|||||||
""" Dummy class used to parse fcurve and driver data paths.
|
""" Dummy class used to parse fcurve and driver data paths.
|
||||||
"""
|
"""
|
||||||
__slots__ = ("data_path", )
|
__slots__ = ("data_path", )
|
||||||
|
|
||||||
def __init__(self, attrs):
|
def __init__(self, attrs):
|
||||||
self.data_path = attrs
|
self.data_path = attrs
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ def write_sysinfo(op):
|
|||||||
ffmpeg = bpy.app.ffmpeg
|
ffmpeg = bpy.app.ffmpeg
|
||||||
if ffmpeg.supported:
|
if ffmpeg.supported:
|
||||||
for lib in ['avcodec', 'avdevice', 'avformat', 'avutil', 'swscale']:
|
for lib in ['avcodec', 'avdevice', 'avformat', 'avutil', 'swscale']:
|
||||||
output.write('{}:{}{}\n'.format(lib, " "*(10-len(lib)),
|
output.write('{}:{}{}\n'.format(lib, " " * (10 - len(lib)),
|
||||||
getattr(ffmpeg, lib + '_version_string')))
|
getattr(ffmpeg, lib + '_version_string')))
|
||||||
else:
|
else:
|
||||||
output.write('Blender was built without FFmpeg support\n')
|
output.write('Blender was built without FFmpeg support\n')
|
||||||
|
@ -49,7 +49,7 @@ def randomize_selected(seed, delta, loc, rot, scale, scale_even, scale_min):
|
|||||||
rotation_mode = obj.rotation_mode
|
rotation_mode = obj.rotation_mode
|
||||||
if rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}:
|
if rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}:
|
||||||
obj.rotation_mode = 'XYZ'
|
obj.rotation_mode = 'XYZ'
|
||||||
|
|
||||||
if delta:
|
if delta:
|
||||||
obj.delta_rotation_euler[0] += vec[0]
|
obj.delta_rotation_euler[0] += vec[0]
|
||||||
obj.delta_rotation_euler[1] += vec[1]
|
obj.delta_rotation_euler[1] += vec[1]
|
||||||
|
@ -32,6 +32,7 @@ from rna_prop_ui import rna_idprop_ui_prop_get, rna_idprop_ui_prop_clear
|
|||||||
import subprocess
|
import subprocess
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
|
||||||
class MESH_OT_delete_edgeloop(Operator):
|
class MESH_OT_delete_edgeloop(Operator):
|
||||||
'''Delete an edge loop by merging the faces on each side to a single face loop'''
|
'''Delete an edge loop by merging the faces on each side to a single face loop'''
|
||||||
bl_idname = "mesh.delete_edgeloop"
|
bl_idname = "mesh.delete_edgeloop"
|
||||||
@ -1176,27 +1177,29 @@ class WM_OT_copy_prev_settings(Operator):
|
|||||||
|
|
||||||
return {'CANCELLED'}
|
return {'CANCELLED'}
|
||||||
|
|
||||||
|
|
||||||
class WM_OT_blenderplayer_start(bpy.types.Operator):
|
class WM_OT_blenderplayer_start(bpy.types.Operator):
|
||||||
'''Launch the Blenderplayer with the current blendfile'''
|
'''Launch the Blenderplayer with the current blendfile'''
|
||||||
bl_idname = "wm.blenderplayer_start"
|
bl_idname = "wm.blenderplayer_start"
|
||||||
bl_label = "Start"
|
bl_label = "Start"
|
||||||
|
|
||||||
blender_bin_path = bpy.app.binary_path
|
blender_bin_path = bpy.app.binary_path
|
||||||
blender_bin_dir = os.path.dirname(blender_bin_path)
|
blender_bin_dir = os.path.dirname(blender_bin_path)
|
||||||
ext = os.path.splitext(blender_bin_path)[-1]
|
ext = os.path.splitext(blender_bin_path)[-1]
|
||||||
player_path = os.path.join(blender_bin_dir, "blenderplayer" + ext)
|
player_path = os.path.join(blender_bin_dir, "blenderplayer" + ext)
|
||||||
|
|
||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
if sys.platform == "darwin":
|
if sys.platform == "darwin":
|
||||||
self.player_path = os.path.join(self.blender_bin_dir, "../../../blenderplayer.app/Contents/MacOS/blenderplayer")
|
self.player_path = os.path.join(self.blender_bin_dir, "../../../blenderplayer.app/Contents/MacOS/blenderplayer")
|
||||||
|
|
||||||
filepath = bpy.app.tempdir + "game.blend"
|
filepath = bpy.app.tempdir + "game.blend"
|
||||||
bpy.ops.wm.save_as_mainfile(filepath=filepath, check_existing=False, copy=True)
|
bpy.ops.wm.save_as_mainfile(filepath=filepath, check_existing=False, copy=True)
|
||||||
subprocess.call([self.player_path, filepath])
|
subprocess.call([self.player_path, filepath])
|
||||||
return {'FINISHED'}
|
return {'FINISHED'}
|
||||||
|
|
||||||
|
|
||||||
class WM_OT_keyconfig_test(Operator):
|
class WM_OT_keyconfig_test(Operator):
|
||||||
"Test keyconfig for conflicts"
|
"Test keyconfig for conflicts"
|
||||||
bl_idname = "wm.keyconfig_test"
|
bl_idname = "wm.keyconfig_test"
|
||||||
@ -1462,6 +1465,7 @@ class WM_OT_operator_cheat_sheet(Operator):
|
|||||||
self.report({'INFO'}, "See OperatorList.txt textblock")
|
self.report({'INFO'}, "See OperatorList.txt textblock")
|
||||||
return {'FINISHED'}
|
return {'FINISHED'}
|
||||||
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
# Addon Operators
|
# Addon Operators
|
||||||
|
|
||||||
@ -1809,7 +1813,7 @@ class WM_OT_theme_export(Operator, ExportHelper):
|
|||||||
|
|
||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
import rna_xml
|
import rna_xml
|
||||||
|
|
||||||
filepath = self.filepath
|
filepath = self.filepath
|
||||||
file = open(filepath, 'w', encoding='utf-8')
|
file = open(filepath, 'w', encoding='utf-8')
|
||||||
|
|
||||||
|
@ -247,6 +247,7 @@ class RenderButtonsPanel():
|
|||||||
class RENDER_PT_embedded(RenderButtonsPanel, bpy.types.Panel):
|
class RENDER_PT_embedded(RenderButtonsPanel, bpy.types.Panel):
|
||||||
bl_label = "Embedded Player"
|
bl_label = "Embedded Player"
|
||||||
COMPAT_ENGINES = {'BLENDER_GAME'}
|
COMPAT_ENGINES = {'BLENDER_GAME'}
|
||||||
|
|
||||||
def draw(self, context):
|
def draw(self, context):
|
||||||
layout = self.layout
|
layout = self.layout
|
||||||
|
|
||||||
@ -270,17 +271,17 @@ class RENDER_PT_game_player(RenderButtonsPanel, Panel):
|
|||||||
layout = self.layout
|
layout = self.layout
|
||||||
|
|
||||||
gs = context.scene.game_settings
|
gs = context.scene.game_settings
|
||||||
|
|
||||||
row = layout.row()
|
row = layout.row()
|
||||||
row.operator("wm.blenderplayer_start", text="Start")
|
row.operator("wm.blenderplayer_start", text="Start")
|
||||||
row.prop(gs, "show_fullscreen")
|
row.prop(gs, "show_fullscreen")
|
||||||
|
|
||||||
row = layout.row()
|
row = layout.row()
|
||||||
row.label(text="Resolution:")
|
row.label(text="Resolution:")
|
||||||
row = layout.row(align=True)
|
row = layout.row(align=True)
|
||||||
row.prop(gs, "resolution_x", slider=False, text="X")
|
row.prop(gs, "resolution_x", slider=False, text="X")
|
||||||
row.prop(gs, "resolution_y", slider=False, text="Y")
|
row.prop(gs, "resolution_y", slider=False, text="Y")
|
||||||
|
|
||||||
col = layout.column()
|
col = layout.column()
|
||||||
col.label(text="Quality:")
|
col.label(text="Quality:")
|
||||||
col = layout.column(align=True)
|
col = layout.column(align=True)
|
||||||
@ -288,7 +289,6 @@ class RENDER_PT_game_player(RenderButtonsPanel, Panel):
|
|||||||
col.prop(gs, "frequency", text="Refresh Rate", slider=False)
|
col.prop(gs, "frequency", text="Refresh Rate", slider=False)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class RENDER_PT_game_stereo(RenderButtonsPanel, Panel):
|
class RENDER_PT_game_stereo(RenderButtonsPanel, Panel):
|
||||||
bl_label = "Stereo"
|
bl_label = "Stereo"
|
||||||
COMPAT_ENGINES = {'BLENDER_GAME'}
|
COMPAT_ENGINES = {'BLENDER_GAME'}
|
||||||
@ -476,6 +476,7 @@ class SCENE_PT_game_navmesh(SceneButtonsPanel, Panel):
|
|||||||
row.prop(rd, "sample_dist")
|
row.prop(rd, "sample_dist")
|
||||||
row.prop(rd, "sample_max_error")
|
row.prop(rd, "sample_max_error")
|
||||||
|
|
||||||
|
|
||||||
class RENDER_PT_game_sound(RenderButtonsPanel, Panel):
|
class RENDER_PT_game_sound(RenderButtonsPanel, Panel):
|
||||||
bl_label = "Sound"
|
bl_label = "Sound"
|
||||||
COMPAT_ENGINES = {'BLENDER_GAME'}
|
COMPAT_ENGINES = {'BLENDER_GAME'}
|
||||||
@ -491,6 +492,7 @@ class RENDER_PT_game_sound(RenderButtonsPanel, Panel):
|
|||||||
col.prop(scene, "audio_doppler_speed", text="Speed")
|
col.prop(scene, "audio_doppler_speed", text="Speed")
|
||||||
col.prop(scene, "audio_doppler_factor")
|
col.prop(scene, "audio_doppler_factor")
|
||||||
|
|
||||||
|
|
||||||
class WorldButtonsPanel():
|
class WorldButtonsPanel():
|
||||||
bl_space_type = 'PROPERTIES'
|
bl_space_type = 'PROPERTIES'
|
||||||
bl_region_type = 'WINDOW'
|
bl_region_type = 'WINDOW'
|
||||||
|
@ -85,7 +85,7 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel):
|
|||||||
|
|
||||||
def draw(self, context):
|
def draw(self, context):
|
||||||
layout = self.layout
|
layout = self.layout
|
||||||
|
|
||||||
if context.scene.render.engine == "BLENDER_GAME":
|
if context.scene.render.engine == "BLENDER_GAME":
|
||||||
layout.label("Not available in the Game Engine")
|
layout.label("Not available in the Game Engine")
|
||||||
return
|
return
|
||||||
|
@ -2248,7 +2248,7 @@ class VIEW3D_PT_view3d_meshdisplay(Panel):
|
|||||||
col.prop(mesh, "show_extra_face_angle")
|
col.prop(mesh, "show_extra_face_angle")
|
||||||
col.prop(mesh, "show_extra_face_area")
|
col.prop(mesh, "show_extra_face_area")
|
||||||
if bpy.app.debug:
|
if bpy.app.debug:
|
||||||
col.prop(mesh, "show_extra_indices")
|
col.prop(mesh, "show_extra_indices")
|
||||||
|
|
||||||
|
|
||||||
class VIEW3D_PT_view3d_curvedisplay(Panel):
|
class VIEW3D_PT_view3d_curvedisplay(Panel):
|
||||||
|
Loading…
Reference in New Issue
Block a user