From d240206c8853aa4a18f0e05087e3166e491cdf9c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 10 Feb 2011 14:59:17 +0000 Subject: fix for crash with GLSL material when image couldn't be loaded. also quiet pep8 warnings. --- release/scripts/ui/properties_data_mesh.py | 2 +- release/scripts/ui/properties_game.py | 3 +-- release/scripts/ui/properties_particle.py | 6 +++--- release/scripts/ui/properties_physics_fluid.py | 2 +- release/scripts/ui/properties_texture.py | 2 +- release/scripts/ui/space_node.py | 2 +- release/scripts/ui/space_userpref.py | 2 -- 7 files changed, 8 insertions(+), 11 deletions(-) (limited to 'release') diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/ui/properties_data_mesh.py index 79e1ba2c6c1..44080b1ffe5 100644 --- a/release/scripts/ui/properties_data_mesh.py +++ b/release/scripts/ui/properties_data_mesh.py @@ -33,7 +33,7 @@ class MESH_MT_vertex_group_specials(bpy.types.Menu): layout.operator("object.vertex_group_copy_to_linked", icon='LINK_AREA') layout.operator("object.vertex_group_copy_to_selected", icon='LINK_AREA') layout.operator("object.vertex_group_mirror", icon='ARROW_LEFTRIGHT') - layout.operator("object.vertex_group_remove", icon='X', text="Delete All").all=True + layout.operator("object.vertex_group_remove", icon='X', text="Delete All").all = True class MESH_MT_shape_key_specials(bpy.types.Menu): diff --git a/release/scripts/ui/properties_game.py b/release/scripts/ui/properties_game.py index 183ad7ea794..77f4da5d405 100644 --- a/release/scripts/ui/properties_game.py +++ b/release/scripts/ui/properties_game.py @@ -163,7 +163,6 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, bpy.types.Panel): subsub.active = game.use_anisotropic_friction subsub.prop(game, "friction_coefficients", text="", slider=True) - elif game.physics_type in ('SENSOR', 'INVISIBLE', 'NO_COLLISION', 'OCCLUDE'): layout.prop(ob, "hide_render", text="Invisible") @@ -347,7 +346,7 @@ class RENDER_PT_game_performance(RenderButtonsPanel, bpy.types.Panel): row.prop(gs, "use_frame_rate") row.prop(gs, "use_display_lists") - + class RENDER_PT_game_display(RenderButtonsPanel, bpy.types.Panel): bl_label = "Display" COMPAT_ENGINES = {'BLENDER_GAME'} diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py index ae39de3996b..27a9a972154 100644 --- a/release/scripts/ui/properties_particle.py +++ b/release/scripts/ui/properties_particle.py @@ -177,7 +177,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel): if part.type == 'HAIR' and not part.use_advanced_hair: row.prop(part, "hair_length") return - + if part.type != 'HAIR': split = layout.split() @@ -1034,7 +1034,7 @@ class PARTICLE_PT_field_weights(ParticleButtonsPanel, bpy.types.Panel): bl_label = "Field Weights" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} - + @classmethod def poll(cls, context): return particle_panel_poll(cls, context) @@ -1083,7 +1083,7 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, bpy.types.Panel): bl_label = "Vertexgroups" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} - + @classmethod def poll(cls, context): return particle_panel_poll(cls, context) diff --git a/release/scripts/ui/properties_physics_fluid.py b/release/scripts/ui/properties_physics_fluid.py index 88eb926dfa0..5cc94c24c80 100644 --- a/release/scripts/ui/properties_physics_fluid.py +++ b/release/scripts/ui/properties_physics_fluid.py @@ -42,7 +42,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): if md: fluid = md.settings - + row = layout.row() if fluid is None: row.label("built without fluids") diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 1e786394ae0..8063dc92166 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -1007,7 +1007,7 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): row = layout.row() # only show bump settings if activated but not for normalmap images - row.active = tex.use_map_normal and not( tex.texture.type == 'IMAGE' and tex.texture.use_normal_map ) + row.active = tex.use_map_normal and not (tex.texture.type == 'IMAGE' and tex.texture.use_normal_map) col = row.column() col.prop(tex, "bump_method", text="Method") diff --git a/release/scripts/ui/space_node.py b/release/scripts/ui/space_node.py index 98c24d407de..64d833434e5 100644 --- a/release/scripts/ui/space_node.py +++ b/release/scripts/ui/space_node.py @@ -166,7 +166,7 @@ class NODE_MT_node(bpy.types.Menu): layout.operator("node.read_fullsamplelayers") -# Node Backdrop options +# Node Backdrop options class NODE_PT_properties(bpy.types.Panel): bl_space_type = 'NODE_EDITOR' bl_region_type = 'UI' diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index af3b5a5dc9d..ff88ed4008c 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -1169,7 +1169,6 @@ class WM_OT_addon_install(bpy.types.Operator): else: os.remove(f_full) - def execute(self, context): import traceback import zipfile @@ -1216,7 +1215,6 @@ class WM_OT_addon_install(bpy.types.Operator): elif os.path.exists(path_dest): self.report({'WARNING'}, "File already installed to %r\n" % path_dest) return {'CANCELLED'} - #if not compressed file just copy into the addon path try: -- cgit v1.2.3