diff options
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/mesh.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/presets.py | 7 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_game.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 6 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_fluid.py | 3 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_rip.c | 4 |
7 files changed, 14 insertions, 12 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index cb03907c194..54a3868c0d7 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -131,7 +131,7 @@ def handle_args(): dest="sphinx_theme", type=str, default='default', - help = + help= # see SPHINX_THEMES below "Sphinx theme (default='default')\n" "Available themes\n" diff --git a/release/scripts/startup/bl_operators/mesh.py b/release/scripts/startup/bl_operators/mesh.py index 2d4c703dbf2..a54de25dbc7 100644 --- a/release/scripts/startup/bl_operators/mesh.py +++ b/release/scripts/startup/bl_operators/mesh.py @@ -100,7 +100,7 @@ class MeshMirrorUV(Operator): vidxs[i] = tuple(sorted(l.vertex_index for l in loops[lstart:lend])) # As we have no poly.center yet... - pcents[i] = tuple(map(lambda x : x / p.loop_total, + pcents[i] = tuple(map(lambda x: x / p.loop_total, map(sum, zip(*(verts[idx].co for idx in vidxs[i]))))) # Preparing next step finding matching polys. diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 2c92fccf3b4..6297945f8bd 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -294,21 +294,22 @@ class AddPresetCloth(AddPresetBase, Operator): preset_subdir = "cloth" + class AddPresetFluid(AddPresetBase, Operator): '''Add a Fluid Preset''' bl_idname = "fluid.preset_add" bl_label = "Add Fluid Preset" preset_menu = "FLUID_MT_presets" - + preset_defines = [ "fluid = bpy.context.fluid" ] - + preset_values = [ "fluid.settings.viscosity_base", "fluid.settings.viscosity_exponent", ] - + preset_subdir = "fluid" diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 36941cdfbbf..c3f1c42d8a8 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -166,7 +166,7 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel): subsub.active = game.use_anisotropic_friction subsub.prop(game, "friction_coefficients", text="", slider=True) - elif physics_type =='SENSOR': + elif physics_type == 'SENSOR': col = layout.column() col.prop(game, "use_actor", text="Detect Actors") col.prop(ob, "hide_render", text="Invisible") diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 74abc8fe559..9200c688394 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -1185,7 +1185,7 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, Panel): psys = context.particle_system split = layout.split(percentage=0.85) - + col = split.column() col.label(text="Vertex Group:") col.prop_search(psys, "vertex_group_density", ob, "vertex_groups", text="Density") @@ -1195,7 +1195,7 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, Panel): col.prop_search(psys, "vertex_group_roughness_1", ob, "vertex_groups", text="Roughness 1") col.prop_search(psys, "vertex_group_roughness_2", ob, "vertex_groups", text="Roughness 2") col.prop_search(psys, "vertex_group_roughness_end", ob, "vertex_groups", text="Roughness End") - + col = split.column() col.label(text="Negate:") col.alignment = 'RIGHT' @@ -1206,7 +1206,7 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, Panel): col.prop(psys, "invert_vertex_group_roughness_1", text="") col.prop(psys, "invert_vertex_group_roughness_2", text="") col.prop(psys, "invert_vertex_group_roughness_end", text="") - + # Commented out vertex groups don't work and are still waiting for better implementation # row = layout.row() # row.prop_search(psys, "vertex_group_velocity", ob, "vertex_groups", text="Velocity") diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 23b7a12753f..cec4bf125ee 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -20,6 +20,7 @@ import bpy from bpy.types import Panel, Menu + class FLUID_MT_presets(Menu): bl_label = "Fluid Presets" preset_subdir = "fluid" @@ -232,7 +233,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel): sub.menu("FLUID_MT_presets", text=bpy.types.FLUID_MT_presets.bl_label) sub.operator("fluid.preset_add", text="", icon='ZOOMIN') sub.operator("fluid.preset_add", text="", icon='ZOOMOUT').remove_active = True - + subsub = col.column(align=True) subsub.prop(fluid, "viscosity_base", text="Base") subsub.prop(fluid, "viscosity_exponent", text="Exponent", slider=True) diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index 1e0f0b2579b..37b12803962 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -228,10 +228,10 @@ static EdgeLoopPair *edbm_ripsel_looptag_helper(BMesh *bm) break; } - e_first = e; - /* initialize */ + e_first = e; v_step = e_first->v1; + e_step = NULL; /* quiet warning, will never remain this value */ uid_start = uid; while ((e = edbm_ripsel_edge_mark_step(v_step, uid))) { |