Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style cleanup: pep8 some C/style

Browse Source
This commit is contained in:
Campbell Barton
2012-04-08 08:09:37 +00:00
parent c1e475e527
commit 4fc6ef1cf5
6 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/modules/bpy_extras/mesh_utils.py
View File

@@ -48,7 +48,8 @@ def mesh_linked_tessfaces(mesh):
# sort faces into connectivity groups # sort faces into connectivity groups
face_groups = [[f] for f in mesh.tessfaces] 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 # Now clump faces iteratively
ok = True ok = True

4
release/scripts/modules/bpy_types.py
View File

@@ -671,7 +671,9 @@ class Header(StructRNA, _GenericUI, metaclass=RNAMeta):
class Menu(StructRNA, _GenericUI, metaclass=RNAMeta): class Menu(StructRNA, _GenericUI, metaclass=RNAMeta):
__slots__ = () __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 layout = self.layout
# hard coded to set the operators 'filepath' to the filename. # hard coded to set the operators 'filepath' to the filename.

2
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@@ -318,7 +318,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column() col = split.column()
col.label(text="Vertex Group:") col.label(text="Vertex Group:")
col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
layout.separator() layout.separator()
layout.prop(md, "strength", slider=True) layout.prop(md, "strength", slider=True)

4
source/blender/bmesh/intern/bmesh_structure.c
View File

@@ -547,8 +547,8 @@ int bmesh_loop_validate(BMFace *f)
/* Validate that the face loop cycle is the length specified by f->len */ /* 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) { for (i = 1, l_iter = l_first->next; i < len; i++, l_iter = l_iter->next) {
if ( (l_iter->f != f) || if ((l_iter->f != f) ||
(l_iter == l_first)) (l_iter == l_first))
{ {
return FALSE; return FALSE;
} }

5
source/blender/bmesh/operators/bmo_connect.c
View File

@@ -147,11 +147,12 @@ static BMVert *get_outer_vert(BMesh *bm, BMEdge *e)
/* Clamp x to the interval {0..len-1}, with wrap-around */ /* Clamp x to the interval {0..len-1}, with wrap-around */
static int clamp_index(const int x, const int len) static int clamp_index(const int x, const int len)
{ {
if (x >= 0) if (x >= 0) {
return x % len; return x % len;
}
else { else {
int r = len - (-x % len); int r = len - (-x % len);
if(r == len) if (r == len)
return len - 1; return len - 1;
else else
return r; return r;

9
source/blender/editors/mesh/editmesh_slide.c
View File

@@ -198,7 +198,7 @@ static void vtx_slide_confirm(bContext *C, wmOperator *op)
/* Invoke operator */ /* Invoke operator */
edbm_vert_slide_exec(C, op); edbm_vert_slide_exec(C, op);
if(vso->snap_n_merge) { if (vso->snap_n_merge) {
float other_d; float other_d;
BMVert* other = BM_edge_other_vert(vso->sel_edge, vso->start_vtx); BMVert* other = BM_edge_other_vert(vso->sel_edge, vso->start_vtx);
other_d = len_v3v3(vso->interp, other->co); 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); 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_op_callf(em, op, "pointmerge verts=%hv mergeco=%v", BM_ELEM_SELECT, other->co);
EDBM_flag_disable_all(em, BM_ELEM_SELECT); EDBM_flag_disable_all(em, BM_ELEM_SELECT);
} else { }
else {
/* Store in historty if not merging */ /* Store in historty if not merging */
EDBM_editselection_store(em, &vso->start_vtx->head); EDBM_editselection_store(em, &vso->start_vtx->head);
} }
} }
else { else {
@@ -247,7 +248,7 @@ static void vtx_slide_exit(const bContext *C, wmOperator *op)
MEM_freeN(vso->edge_frame); MEM_freeN(vso->edge_frame);
} }
if(vso->vtx_frame) { if (vso->vtx_frame) {
MEM_freeN(vso->vtx_frame); MEM_freeN(vso->vtx_frame);
} }