[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45472] trunk/blender: style cleanup: pep8 some C/style
Campbell Barton
ideasman42 at gmail.com
Sun Apr 8 10:09:37 CEST 2012
Revision: 45472
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45472
Author: campbellbarton
Date: 2012-04-08 08:09:37 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
style cleanup: pep8 some C/style
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
trunk/blender/source/blender/bmesh/operators/bmo_connect.c
trunk/blender/source/blender/editors/mesh/editmesh_slide.c
trunk/blender/source/tools/update_themes.py
Modified: trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2012-04-08 07:34:09 UTC (rev 45471)
+++ trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2012-04-08 08:09:37 UTC (rev 45472)
@@ -48,7 +48,8 @@
# 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
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2012-04-08 07:34:09 UTC (rev 45471)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2012-04-08 08:09:37 UTC (rev 45472)
@@ -671,7 +671,9 @@
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.
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2012-04-08 07:34:09 UTC (rev 45471)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2012-04-08 08:09:37 UTC (rev 45472)
@@ -318,7 +318,7 @@
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)
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_structure.c 2012-04-08 07:34:09 UTC (rev 45471)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_structure.c 2012-04-08 08:09:37 UTC (rev 45472)
@@ -547,8 +547,8 @@
/* 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;
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_connect.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2012-04-08 07:34:09 UTC (rev 45471)
+++ trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2012-04-08 08:09:37 UTC (rev 45472)
@@ -147,11 +147,12 @@
/* 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;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_slide.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_slide.c 2012-04-08 07:34:09 UTC (rev 45471)
+++ trunk/blender/source/blender/editors/mesh/editmesh_slide.c 2012-04-08 08:09:37 UTC (rev 45472)
@@ -198,7 +198,7 @@
/* 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 @@
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 @@
MEM_freeN(vso->edge_frame);
}
- if(vso->vtx_frame) {
+ if (vso->vtx_frame) {
MEM_freeN(vso->vtx_frame);
}
Modified: trunk/blender/source/tools/update_themes.py
===================================================================
--- trunk/blender/source/tools/update_themes.py 2012-04-08 07:34:09 UTC (rev 45471)
+++ trunk/blender/source/tools/update_themes.py 2012-04-08 08:09:37 UTC (rev 45472)
@@ -19,16 +19,17 @@
# <pep8 compliant>
# this script updates XML themes once new settings are added
-#
+#
# ./blender.bin --background --python source/tools/update_themes.py
import bpy
import os
+
def update(filepath):
import rna_xml
context = bpy.context
-
+
print("Updating theme: %r" % filepath)
preset_xml_map = (("user_preferences.themes[0]", "Theme"), )
rna_xml.xml_file_run(context,
@@ -39,6 +40,7 @@
filepath,
preset_xml_map)
+
def main():
for path in bpy.utils.preset_paths("interface_theme"):
for fn in os.listdir(path):
More information about the Bf-blender-cvs
mailing list