Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-04-08 12:09:37 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-04-08 12:09:37 +0400
commit4fc6ef1cf57a48626cbfa7fd9cc09de9bec29f92 (patch)
tree6e1c9f9381d5a6a8027e265ddb56ab909cc1b99c
parentc1e475e527c49ed1a355472f560ae43a27af8f15 (diff)
style cleanup: pep8 some C/style
-rw-r--r--release/scripts/modules/bpy_extras/mesh_utils.py3
-rw-r--r--release/scripts/modules/bpy_types.py4
-rw-r--r--release/scripts/startup/bl_ui/properties_data_modifier.py2
-rw-r--r--source/blender/bmesh/intern/bmesh_structure.c4
-rw-r--r--source/blender/bmesh/operators/bmo_connect.c5
-rw-r--r--source/blender/editors/mesh/editmesh_slide.c9
6 files changed, 16 insertions, 11 deletions
diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py
index c3ecfcd5dca..3ce45154765 100644
--- a/release/scripts/modules/bpy_extras/mesh_utils.py
+++ b/release/scripts/modules/bpy_extras/mesh_utils.py
@@ -48,7 +48,8 @@ def mesh_linked_tessfaces(mesh):
# sort faces into connectivity groups
face_groups = [[f] for f in mesh.tessfaces]
- face_mapping = list(range(len(mesh.tessfaces))) # map old, new face location
+ # map old, new face location
+ face_mapping = list(range(len(mesh.tessfaces)))
# Now clump faces iteratively
ok = True
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py
index 6f921868ccc..131bb8ee77e 100644
--- a/release/scripts/modules/bpy_types.py
+++ b/release/scripts/modules/bpy_types.py
@@ -671,7 +671,9 @@ class Header(StructRNA, _GenericUI, metaclass=RNAMeta):
class Menu(StructRNA, _GenericUI, metaclass=RNAMeta):
__slots__ = ()
- def path_menu(self, searchpaths, operator, props_default={}, filter_ext=None):
+ def path_menu(self, searchpaths, operator,
+ props_default={}, filter_ext=None):
+
layout = self.layout
# hard coded to set the operators 'filepath' to the filename.
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 50b4a575383..a4e7d107099 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -318,7 +318,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.label(text="Vertex Group:")
col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
-
+
layout.separator()
layout.prop(md, "strength", slider=True)
diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c
index aa5c8b81c2a..7fcd6f39fb8 100644
--- a/source/blender/bmesh/intern/bmesh_structure.c
+++ b/source/blender/bmesh/intern/bmesh_structure.c
@@ -547,8 +547,8 @@ int bmesh_loop_validate(BMFace *f)
/* Validate that the face loop cycle is the length specified by f->len */
for (i = 1, l_iter = l_first->next; i < len; i++, l_iter = l_iter->next) {
- if ( (l_iter->f != f) ||
- (l_iter == l_first))
+ if ((l_iter->f != f) ||
+ (l_iter == l_first))
{
return FALSE;
}
diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c
index 07be4cdd5c1..69a9b75b258 100644
--- a/source/blender/bmesh/operators/bmo_connect.c
+++ b/source/blender/bmesh/operators/bmo_connect.c
@@ -147,11 +147,12 @@ static BMVert *get_outer_vert(BMesh *bm, BMEdge *e)
/* Clamp x to the interval {0..len-1}, with wrap-around */
static int clamp_index(const int x, const int len)
{
- if (x >= 0)
+ if (x >= 0) {
return x % len;
+ }
else {
int r = len - (-x % len);
- if(r == len)
+ if (r == len)
return len - 1;
else
return r;
diff --git a/source/blender/editors/mesh/editmesh_slide.c b/source/blender/editors/mesh/editmesh_slide.c
index 063690a5d9d..94c546f0f1b 100644
--- a/source/blender/editors/mesh/editmesh_slide.c
+++ b/source/blender/editors/mesh/editmesh_slide.c
@@ -198,7 +198,7 @@ static void vtx_slide_confirm(bContext *C, wmOperator *op)
/* Invoke operator */
edbm_vert_slide_exec(C, op);
- if(vso->snap_n_merge) {
+ if (vso->snap_n_merge) {
float other_d;
BMVert* other = BM_edge_other_vert(vso->sel_edge, vso->start_vtx);
other_d = len_v3v3(vso->interp, other->co);
@@ -209,9 +209,10 @@ static void vtx_slide_confirm(bContext *C, wmOperator *op)
BM_vert_select_set(bm, vso->start_vtx, TRUE);
EDBM_op_callf(em, op, "pointmerge verts=%hv mergeco=%v", BM_ELEM_SELECT, other->co);
EDBM_flag_disable_all(em, BM_ELEM_SELECT);
- } else {
+ }
+ else {
/* Store in historty if not merging */
- EDBM_editselection_store(em, &vso->start_vtx->head);
+ EDBM_editselection_store(em, &vso->start_vtx->head);
}
}
else {
@@ -247,7 +248,7 @@ static void vtx_slide_exit(const bContext *C, wmOperator *op)
MEM_freeN(vso->edge_frame);
}
- if(vso->vtx_frame) {
+ if (vso->vtx_frame) {
MEM_freeN(vso->vtx_frame);
}