[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45129] trunk/blender: style cleanup: pep8 , indentation
Campbell Barton
ideasman42 at gmail.com
Sat Mar 24 08:36:49 CET 2012
Revision: 45129
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45129
Author: campbellbarton
Date: 2012-03-24 07:36:32 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
style cleanup: pep8, indentation
Modified Paths:
--------------
trunk/blender/doc/python_api/sphinx_doc_gen.py
trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
trunk/blender/release/scripts/startup/bl_operators/presets.py
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/blenlib/intern/math_matrix.c
trunk/blender/source/blender/blenlib/intern/string_utf8.c
trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
trunk/blender/source/blender/imbuf/intern/dds/BlockDXT.cpp
trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.cpp
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
trunk/blender/source/blender/python/generic/py_capi_utils.c
trunk/blender/source/gameengine/Expressions/ErrorValue.cpp
trunk/blender/source/gameengine/Expressions/Operator2Expr.cpp
trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.cpp
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2012-03-24 07:09:57 UTC (rev 45128)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2012-03-24 07:36:32 UTC (rev 45129)
@@ -131,7 +131,7 @@
dest="sphinx_theme",
type=str,
default='default',
- help=
+ help =
# see SPHINX_THEMES below
"Sphinx theme (default='default')\n"
"Available themes\n"
@@ -448,6 +448,7 @@
def is_struct_seq(value):
return isinstance(value, tuple) and type(tuple) != tuple and hasattr(value, "n_fields")
+
def undocumented_message(module_name, type_name, identifier):
if str(type_name).startswith('<module'):
preloadtitle = '%s.%s' % (module_name, identifier)
@@ -503,7 +504,7 @@
def title_string(text, heading_char, double=False):
filler = len(text) * heading_char
-
+
if double:
return "%s\n%s\n%s\n\n" % (filler, text, filler)
else:
@@ -692,6 +693,7 @@
# TODO - currently only used for classes
# grouping support
module_grouping = MODULE_GROUPING.get(module_name)
+
def module_grouping_index(name):
if module_grouping is not None:
try:
@@ -706,11 +708,10 @@
if i >= 0 and type(module_grouping[i]) == tuple:
return module_grouping[i]
return None, None
-
+
def module_grouping_sort_key(name):
return module_grouping_index(name)
# done grouping support
-
file = open(filepath, "w", encoding="utf-8")
@@ -866,7 +867,7 @@
# write collected classes now
for (type_name, value) in classes:
-
+
if module_grouping is not None:
heading, heading_char = module_grouping_heading(type_name)
if heading:
@@ -1778,7 +1779,7 @@
bpy_logfilehandler = logging.FileHandler(bpy_logfile, mode="w")
bpy_logfilehandler.setLevel(logging.DEBUG)
BPY_LOGGER.addHandler(bpy_logfilehandler)
-
+
# using a FileHandler seems to disable the stdout, so we add a StreamHandler
bpy_log_stdout_handler = logging.StreamHandler(stream=sys.stdout)
bpy_log_stdout_handler.setLevel(logging.DEBUG)
@@ -1872,7 +1873,7 @@
# zip REFERENCE_PATH
basename = os.path.join(ARGS.output_dir, REFERENCE_NAME)
tmp_path = shutil.make_archive(basename, 'zip',
- root_dir=ARGS.output_dir,
+ root_dir=ARGS.output_dir,
base_dir=REFERENCE_NAME)
final_path = os.path.join(REFERENCE_PATH, BLENDER_ZIP_FILENAME)
os.rename(tmp_path, final_path)
Modified: trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py 2012-03-24 07:09:57 UTC (rev 45128)
+++ trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py 2012-03-24 07:36:32 UTC (rev 45129)
@@ -147,7 +147,7 @@
mesh = bpy.data.meshes.new("Torus")
mesh.vertices.add(len(verts_loc) // 3)
-
+
# BMESH_TODO, use polygons
mesh.faces.add(len(faces) // 4)
Modified: trunk/blender/release/scripts/startup/bl_operators/presets.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/presets.py 2012-03-24 07:09:57 UTC (rev 45128)
+++ trunk/blender/release/scripts/startup/bl_operators/presets.py 2012-03-24 07:36:32 UTC (rev 45129)
@@ -22,6 +22,7 @@
from bpy.types import Menu, Operator
from bpy.props import StringProperty, BoolProperty
+
class AddPresetBase():
'''Base preset class, only for subclassing
subclasses must define
Modified: trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2012-03-24 07:09:57 UTC (rev 45128)
+++ trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2012-03-24 07:36:32 UTC (rev 45129)
@@ -728,7 +728,7 @@
col = layout.column()
col.label(text="Distortion:")
col.prop(strip, "undistort")
-
+
row = layout.row()
row.label(text="Flip:")
row.prop(strip, "use_flip_x", text="X")
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-03-24 07:09:57 UTC (rev 45128)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-03-24 07:36:32 UTC (rev 45129)
@@ -1050,7 +1050,7 @@
layout.prop(ups, "use_unified_size", text="Unified Size")
layout.prop(ups, "use_unified_strength", text="Unified Strength")
layout.separator()
-
+
# brush paint modes
layout.menu("VIEW3D_MT_brush_paint_modes")
@@ -1088,6 +1088,7 @@
layout.prop(brush, "use_persistent")
layout.operator("sculpt.set_persistent_base")
+
class VIEW3D_MT_brush_paint_modes(Menu):
bl_label = "Enabled Modes"
@@ -1242,8 +1243,8 @@
op = layout.operator("paint.hide_show", text="Show Bounding Box")
op.action = 'SHOW'
op.area = 'INSIDE'
-
+
# ********** Particle menu **********
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-03-24 07:09:57 UTC (rev 45128)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-03-24 07:36:32 UTC (rev 45129)
@@ -1828,11 +1828,11 @@
dest_offset = dest_index * typeInfo->size;
if (!src_data || !dest_data) {
- if (src_data != NULL && dest_data != NULL) {
- printf("%s: warning null data for %s type (%p --> %p), skipping\n",
- __func__, layerType_getName(source->layers[src_i].type),
- (void *)src_data, (void *)dest_data);
- }
+ if (src_data != NULL && dest_data != NULL) {
+ printf("%s: warning null data for %s type (%p --> %p), skipping\n",
+ __func__, layerType_getName(source->layers[src_i].type),
+ (void *)src_data, (void *)dest_data);
+ }
continue;
}
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2012-03-24 07:09:57 UTC (rev 45128)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2012-03-24 07:36:32 UTC (rev 45129)
@@ -1913,7 +1913,7 @@
register_node_type_cmp_channel_matte(ttype);
register_node_type_cmp_color_spill(ttype);
register_node_type_cmp_luma_matte(ttype);
- register_node_type_cmp_doubleedgemask(ttype);
+ register_node_type_cmp_doubleedgemask(ttype);
register_node_type_cmp_translate(ttype);
register_node_type_cmp_rotate(ttype);
Modified: trunk/blender/source/blender/blenlib/intern/freetypefont.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/freetypefont.c 2012-03-24 07:09:57 UTC (rev 45128)
+++ trunk/blender/source/blender/blenlib/intern/freetypefont.c 2012-03-24 07:36:32 UTC (rev 45129)
@@ -538,9 +538,8 @@
short* contours; /* the contour end points */
int flags; /* outline masks */
+} FT_Outline;
- } FT_Outline;
-
#endif
/***//*
Modified: trunk/blender/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_matrix.c 2012-03-24 07:09:57 UTC (rev 45128)
+++ trunk/blender/source/blender/blenlib/intern/math_matrix.c 2012-03-24 07:36:32 UTC (rev 45129)
@@ -811,36 +811,36 @@
int is_orthogonal_m3(float m[][3])
{
- int i, j;
+ int i, j;
- for (i = 0; i < 3; i++) {
- for (j = 0; j < i; j++) {
- if (fabsf(dot_v3v3(m[i], m[j])) > 1.5f * FLT_EPSILON)
- return 0;
- }
+ for (i = 0; i < 3; i++) {
+ for (j = 0; j < i; j++) {
+ if (fabsf(dot_v3v3(m[i], m[j])) > 1.5f * FLT_EPSILON)
+ return 0;
+ }
- if (fabsf(dot_v3v3(m[i], m[i]) - 1) > 1.5f * FLT_EPSILON)
- return 0;
- }
+ if (fabsf(dot_v3v3(m[i], m[i]) - 1) > 1.5f * FLT_EPSILON)
+ return 0;
+ }
- return 1;
+ return 1;
}
int is_orthogonal_m4(float m[][4])
{
- int i, j;
+ int i, j;
- for (i = 0; i < 4; i++) {
- for (j = 0; j < i; j++) {
- if (fabsf(dot_vn_vn(m[i], m[j], 4)) > 1.5f * FLT_EPSILON)
- return 0;
- }
+ for (i = 0; i < 4; i++) {
+ for (j = 0; j < i; j++) {
+ if (fabsf(dot_vn_vn(m[i], m[j], 4)) > 1.5f * FLT_EPSILON)
+ return 0;
+ }
- if (fabsf(dot_vn_vn(m[i], m[i], 4) - 1) > 1.5f * FLT_EPSILON)
- return 0;
- }
+ if (fabsf(dot_vn_vn(m[i], m[i], 4) - 1) > 1.5f * FLT_EPSILON)
+ return 0;
+ }
- return 1;
+ return 1;
}
void normalize_m3(float mat[][3])
Modified: trunk/blender/source/blender/blenlib/intern/string_utf8.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string_utf8.c 2012-03-24 07:09:57 UTC (rev 45128)
+++ trunk/blender/source/blender/blenlib/intern/string_utf8.c 2012-03-24 07:36:32 UTC (rev 45129)
@@ -359,16 +359,16 @@
**/
unsigned int BLI_str_utf8_as_unicode(const char *p)
{
- int i, mask = 0, len;
- unsigned int result;
- unsigned char c = (unsigned char) *p;
+ int i, mask = 0, len;
+ unsigned int result;
+ unsigned char c = (unsigned char) *p;
- UTF8_COMPUTE (c, mask, len);
- if (len == -1)
- return BLI_UTF8_ERR;
- UTF8_GET (result, p, i, mask, len, BLI_UTF8_ERR);
+ UTF8_COMPUTE (c, mask, len);
+ if (len == -1)
+ return BLI_UTF8_ERR;
+ UTF8_GET (result, p, i, mask, len, BLI_UTF8_ERR);
- return result;
+ return result;
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list