archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Code cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2014-02-13 08:51:33 +11:00
parent 8547d17739
commit aea00c7a81
21 changed files with 105 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_set.py
View File

@@ -8,4 +8,3 @@ collection.foreach_set(attr, some_seq)
# Python equivalent
for i in range(len(some_seq)):
setattr(collection[i], attr, some_seq[i])

1
doc/python_api/examples/mathutils.kdtree.py
View File

@@ -34,4 +34,3 @@ print("Close points within 0.5 distance")
co_find = context.scene.cursor_location
for (co, index, dist) in kd.find_range(co_find, 0.5):
print(" ", co, index, dist)

1
intern/cycles/blender/addon/engine.py
View File

@@ -89,6 +89,7 @@ def with_osl():
import _cycles
return _cycles.with_osl
def with_network():
import _cycles
return _cycles.with_network

2
intern/cycles/blender/addon/properties.py
View File

@@ -33,7 +33,7 @@ enum_devices = (
)
if _cycles.with_network:
enum_devices += (('NETWORK', "Networked Device", "Use networked device for rendering"),)
enum_devices += (('NETWORK', "Networked Device", "Use networked device for rendering"),)
enum_feature_set = (
('SUPPORTED', "Supported", "Only use finished and supported features"),

3
intern/cycles/blender/addon/ui.py
View File

@@ -1195,7 +1195,7 @@ class CyclesRender_PT_CurveRendering(CyclesButtonsPanel, Panel):
layout.prop(ccscene, "primitive", text="Primitive")
layout.prop(ccscene, "shape", text="Shape")
if (ccscene.primitive in {'CURVE_SEGMENTS', 'LINE_SEGMENTS'} and ccscene.shape == 'RIBBONS') == False:
if not (ccscene.primitive in {'CURVE_SEGMENTS', 'LINE_SEGMENTS'} and ccscene.shape == 'RIBBONS'):
layout.prop(ccscene, "cull_backfacing", text="Cull back-faces")
if ccscene.primitive == 'TRIANGLES' and ccscene.shape == 'THICK':
@@ -1382,6 +1382,7 @@ def get_panels():
return [getattr(types, p) for p in panels if hasattr(types, p)]
def register():
bpy.types.RENDER_PT_render.append(draw_device)
bpy.types.VIEW3D_HT_header.append(draw_pause)

2
release/scripts/modules/bl_i18n_utils/utils.py
View File

@@ -1285,7 +1285,6 @@ class I18n:
return path, env[tuple_id]
return None, None # No data...
def parse(self, kind, src, langs=set()):
self.parsers[kind](self, src, langs)
@@ -1372,6 +1371,7 @@ class I18n:
({} currently).
""".format(self.settings.PARSER_TEMPLATE_ID)
default_context = self.settings.DEFAULT_CONTEXT
def _gen_py(self, langs, tab=" "):
_lencomm = len(self.settings.PO_COMMENT_PREFIX)
_lengen = len(self.settings.PO_COMMENT_PREFIX_GENERATED)

2
release/scripts/modules/bl_i18n_utils/utils_rtl.py
View File

@@ -118,7 +118,7 @@ def protect_format_seq(msg):
dlt = 2
while (idx + dlt) < ln and msg[idx + dlt] in digits:
dlt += 1
if (idx + dlt) < ln and msg[idx + dlt] is '|':
if (idx + dlt) < ln and msg[idx + dlt] is '|':
dlt += 1
# %.4f
elif idx < (ln - 3) and msg[idx] == '%' and msg[idx + 1] in digits:

4
release/scripts/modules/bpy_extras/io_utils.py
View File

@@ -409,7 +409,9 @@ def path_reference(filepath,
if mode == 'ABSOLUTE':
return filepath_abs
elif mode == 'RELATIVE':
try: # can't always find the relative path (between drive letters on windows)
# can't always find the relative path
# (between drive letters on windows)
try:
return os.path.relpath(filepath_abs, base_dst)
except ValueError:
return filepath_abs

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

@@ -232,7 +232,8 @@ def object_add_grid_scale_apply_operator(operator, context):
if not properties.is_property_set(prop_id):
prop_def = properties_def[prop_id]
if prop_def.unit == 'LENGTH' and prop_def.subtype == 'DISTANCE':
setattr(operator, prop_id, getattr(operator, prop_id) * grid_scale)
setattr(operator, prop_id,
getattr(operator, prop_id) * grid_scale)
def object_image_guess(obj, bm=None):

2
release/scripts/modules/sys_info.py
View File

@@ -133,7 +133,7 @@ def write_sysinfo(op):
oiio = bpy.app.oiio
output.write("OpenImageIO: ")
if ocio.supported :
if ocio.supported:
output.write("%s\n" % (oiio.version_string))
else:
output.write("Blender was built without OpenImageIO support\n")

1
release/scripts/startup/bl_operators/object.py
View File

@@ -938,4 +938,3 @@ class LodGenerate(Operator):
scene.objects.active = ob
return {'FINISHED'}

54
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@@ -40,6 +40,7 @@ def draw_repeat_tools(context, layout):
col.operator("screen.repeat_last")
col.operator("screen.repeat_history", text="History...")
# Keyframing tools
def draw_keyframing_tools(context, layout):
col = layout.column(align=True)
@@ -48,6 +49,7 @@ def draw_keyframing_tools(context, layout):
row.operator("anim.keyframe_insert_menu", text="Insert")
row.operator("anim.keyframe_delete_v3d", text="Remove")
# Grease Pencil tools
def draw_gpencil_tools(context, layout):
col = layout.column(align=True)
@@ -70,6 +72,7 @@ def draw_gpencil_tools(context, layout):
# ********** default tools for object-mode ****************
class VIEW3D_PT_tools_transform(View3DPanel, Panel):
bl_category = "Tools"
bl_context = "objectmode"
@@ -89,6 +92,7 @@ class VIEW3D_PT_tools_transform(View3DPanel, Panel):
col = layout.column(align=True)
col.operator("transform.mirror", text="Mirror")
class VIEW3D_PT_tools_object(View3DPanel, Panel):
bl_category = "Tools"
bl_context = "objectmode"
@@ -119,6 +123,7 @@ class VIEW3D_PT_tools_object(View3DPanel, Panel):
row.operator("object.shade_smooth", text="Smooth")
row.operator("object.shade_flat", text="Flat")
class VIEW3D_PT_tools_objectmode(View3DPanel, Panel):
bl_category = "Tools"
bl_context = "objectmode"
@@ -136,12 +141,13 @@ class VIEW3D_PT_tools_objectmode(View3DPanel, Panel):
draw_repeat_tools(context, layout)
class VIEW3D_PT_tools_add_mesh(View3DPanel, Panel):
bl_category = "Create"
bl_context = "objectmode"
bl_label = "Add Primitive"
def draw (self, context):
def draw(self, context):
layout = self.layout
col = layout.column(align=True)
@@ -160,22 +166,23 @@ class VIEW3D_PT_tools_add_mesh(View3DPanel, Panel):
col.label(text="Curve:")
col.operator("curve.primitive_bezier_curve_add", text="Curve", icon="CURVE_BEZCURVE")
col.operator("curve.primitive_bezier_circle_add", text="Circle", icon="CURVE_BEZCIRCLE")
col.operator("curve.primitive_nurbs_path_add", text="Path" , icon="CURVE_PATH")
col.operator("curve.primitive_nurbs_path_add", text="Path", icon="CURVE_PATH")
col.label(text="Lamp:")
col.operator("object.lamp_add", text="Point", icon="LAMP_POINT").type='POINT'
col.operator("object.lamp_add", text="Sun", icon="LAMP_SUN").type='SUN'
col.operator("object.lamp_add", text="Spot", icon="LAMP_SPOT").type='SPOT'
col.operator("object.lamp_add", text="Hemi", icon="LAMP_HEMI").type='HEMI'
col.operator("object.lamp_add", text="Area", icon="LAMP_AREA").type='AREA'
col.operator("object.lamp_add", text="Point", icon="LAMP_POINT").type = 'POINT'
col.operator("object.lamp_add", text="Sun", icon="LAMP_SUN").type = 'SUN'
col.operator("object.lamp_add", text="Spot", icon="LAMP_SPOT").type = 'SPOT'
col.operator("object.lamp_add", text="Hemi", icon="LAMP_HEMI").type = 'HEMI'
col.operator("object.lamp_add", text="Area", icon="LAMP_AREA").type = 'AREA'
col.label(text="Other:")
col.operator("object.text_add", text="Text", icon ="OUTLINER_OB_FONT")
col.operator("object.armature_add",text="Armature", icon="OUTLINER_OB_ARMATURE")
col.operator("object.add", text="Lattice", icon="OUTLINER_OB_LATTICE").type='LATTICE'
col.operator("object.empty_add", text="Empty", icon="OUTLINER_OB_EMPTY").type='PLAIN_AXES'
col.operator("object.text_add", text="Text", icon="OUTLINER_OB_FONT")
col.operator("object.armature_add", text="Armature", icon="OUTLINER_OB_ARMATURE")
col.operator("object.add", text="Lattice", icon="OUTLINER_OB_LATTICE").type = 'LATTICE'
col.operator("object.empty_add", text="Empty", icon="OUTLINER_OB_EMPTY").type = 'PLAIN_AXES'
col.operator("object.camera_add", text="Camera", icon="OUTLINER_OB_CAMERA")
class VIEW3D_PT_tools_relations(View3DPanel, Panel):
bl_category = "Relations"
bl_context = "objectmode"
@@ -210,6 +217,7 @@ class VIEW3D_PT_tools_relations(View3DPanel, Panel):
col.operator("object.make_local")
col.operator("object.proxy_make")
class VIEW3D_PT_tools_animation(View3DPanel, Panel):
bl_category = "Animation"
bl_context = "objectmode"
@@ -231,6 +239,7 @@ class VIEW3D_PT_tools_animation(View3DPanel, Panel):
col.label(text="Action:")
col.operator("nla.bake", text="Bake Action")
class VIEW3D_PT_tools_rigidbody(View3DPanel, Panel):
bl_category = "Physics"
bl_context = "objectmode"
@@ -275,6 +284,7 @@ class VIEW3D_PT_tools_transform_mesh(View3DPanel, Panel):
col.operator("transform.shrink_fatten", text="Shrink/Fatten")
col.operator("transform.push_pull", text="Push/Pull")
class VIEW3D_PT_tools_meshedit(View3DPanel, Panel):
bl_category = "Tools"
bl_context = "mesh_edit"
@@ -322,12 +332,13 @@ class VIEW3D_PT_tools_meshedit(View3DPanel, Panel):
draw_repeat_tools(context, layout)
class VIEW3D_PT_tools_add_mesh_edit(View3DPanel, Panel):
bl_category = "Create"
bl_context = "mesh_edit"
bl_label = "Add Meshes"
def draw (self, context):
def draw(self, context):
layout = self.layout
col = layout.column(align=True)
@@ -346,6 +357,7 @@ class VIEW3D_PT_tools_add_mesh_edit(View3DPanel, Panel):
col.operator("mesh.primitive_grid_add", text="Grid", icon="MESH_GRID")
col.operator("mesh.primitive_monkey_add", text="Monkey", icon="MESH_MONKEY")
class VIEW3D_PT_tools_shading(View3DPanel, Panel):
bl_category = "Shading / UVs"
bl_context = "mesh_edit"
@@ -370,6 +382,7 @@ class VIEW3D_PT_tools_uvs(View3DPanel, Panel):
bl_category = "Shading / UVs"
bl_context = "mesh_edit"
bl_label = "UVs"
def draw(self, context):
layout = self.layout
@@ -417,6 +430,7 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
# ********** default tools for editmode_curve ****************
class VIEW3D_PT_tools_transform_curve(View3DPanel, Panel):
bl_category = "Tools"
bl_context = "curve_edit"
@@ -434,6 +448,7 @@ class VIEW3D_PT_tools_transform_curve(View3DPanel, Panel):
col.operator("transform.tilt", text="Tilt")
col.operator("transform.transform", text="Scale Feather").mode = 'CURVE_SHRINKFATTEN'
class VIEW3D_PT_tools_curveedit(View3DPanel, Panel):
bl_category = "Tools"
bl_context = "curve_edit"
@@ -471,12 +486,13 @@ class VIEW3D_PT_tools_curveedit(View3DPanel, Panel):
draw_repeat_tools(context, layout)
class VIEW3D_PT_tools_add_curve_edit(View3DPanel, Panel):
bl_category = "Create"
bl_context = "curve_edit"
bl_label = "Add Curves"
def draw (self, context):
def draw(self, context):
layout = self.layout
col = layout.column(align=True)
@@ -488,10 +504,11 @@ class VIEW3D_PT_tools_add_curve_edit(View3DPanel, Panel):
col.label(text="Nurbs:")
col.operator("curve.primitive_nurbs_curve_add", text="Nurbs Curve", icon="CURVE_NCURVE")
col.operator("curve.primitive_nurbs_circle_add", text="Nurbs Circle", icon="CURVE_NCIRCLE")
col.operator("curve.primitive_nurbs_path_add", text="Nurbs Path" , icon="CURVE_PATH")
col.operator("curve.primitive_nurbs_path_add", text="Nurbs Path", icon="CURVE_PATH")
# ********** default tools for editmode_surface ****************
class VIEW3D_PT_tools_transform_surface(View3DPanel, Panel):
bl_category = "Tools"
bl_context = "surface_edit"
@@ -505,6 +522,7 @@ class VIEW3D_PT_tools_transform_surface(View3DPanel, Panel):
col.operator("transform.rotate")
col.operator("transform.resize", text="Scale")
class VIEW3D_PT_tools_surfaceedit(View3DPanel, Panel):
bl_category = "Tools"
bl_context = "surface_edit"
@@ -527,12 +545,13 @@ class VIEW3D_PT_tools_surfaceedit(View3DPanel, Panel):
draw_repeat_tools(context, layout)
class VIEW3D_PT_tools_add_surface_edit(View3DPanel, Panel):
bl_category = "Create"
bl_context = "surface_edit"
bl_label = "Add Surfaces"
def draw (self, context):
def draw(self, context):
layout = self.layout
col = layout.column(align=True)
@@ -628,12 +647,13 @@ class VIEW3D_PT_tools_mballedit(View3DPanel, Panel):
draw_repeat_tools(context, layout)
class VIEW3D_PT_tools_add_mball_edit(View3DPanel, Panel):
bl_category = "Create"
bl_context = "mball_edit"
bl_label = "Add Metaball"
def draw (self, context):
def draw(self, context):
layout = self.layout
col = layout.column(align=True)
@@ -1289,6 +1309,7 @@ class VIEW3D_PT_sculpt_symmetry(Panel, View3DPaintPanel):
row.prop(sculpt, "lock_y", text="Y", toggle=True)
row.prop(sculpt, "lock_z", text="Z", toggle=True)
class VIEW3D_PT_tools_brush_appearance(Panel, View3DPaintPanel):
bl_category = "Options"
bl_label = "Appearance"
@@ -1591,6 +1612,7 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, Panel):
sub.active = pe.use_fade_time
sub.prop(pe, "fade_frames", slider=True)
# Grease Pencil tools
class VIEW3D_PT_tools_greasepencil(View3DPanel, Panel):
bl_category = "Grease Pencil"

18
source/blender/compositor/intern/COM_Debug.cpp
View File

@@ -399,15 +399,15 @@ void DebugInfo::graphviz(ExecutionSystem *system)
#else
std::string DebugInfo::node_name(NodeBase */*node*/) { return ""; }
std::string DebugInfo::node_name(NodeBase * /*node*/) { return ""; }
void DebugInfo::convert_started() {}
void DebugInfo::execute_started(ExecutionSystem */*system*/) {}
void DebugInfo::node_added(Node */*node*/) {}
void DebugInfo::node_to_operations(Node */*node*/) {}
void DebugInfo::operation_added(NodeOperation */*operation*/) {}
void DebugInfo::operation_read_write_buffer(NodeOperation */*operation*/) {}
void DebugInfo::execution_group_started(ExecutionGroup */*group*/) {}
void DebugInfo::execution_group_finished(ExecutionGroup */*group*/) {}
void DebugInfo::graphviz(ExecutionSystem */*system*/) {}
void DebugInfo::execute_started(ExecutionSystem * /*system*/) {}
void DebugInfo::node_added(Node * /*node*/) {}
void DebugInfo::node_to_operations(Node * /*node*/) {}
void DebugInfo::operation_added(NodeOperation * /*operation*/) {}
void DebugInfo::operation_read_write_buffer(NodeOperation * /*operation*/) {}
void DebugInfo::execution_group_started(ExecutionGroup * /*group*/) {}
void DebugInfo::execution_group_finished(ExecutionGroup * /*group*/) {}
void DebugInfo::graphviz(ExecutionSystem * /*system*/) {}
#endif

1
source/blender/datatoc/datatoc_icon.py
View File

@@ -152,4 +152,3 @@ def main():
if __name__ == "__main__":
main()

2
source/blender/editors/interface/interface_regions.c
View File

@@ -2123,7 +2123,7 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
direction = pup->block->direction;
}
else if ((pup->but->type == PULLDOWN) ||
(uiButGetMenuType(pup->but) != NULL))
(uiButGetMenuType(pup->but) != NULL))
{
direction = UI_DOWN;
}

2
source/blender/editors/sculpt_paint/sculpt_uv.c
View File

@@ -169,7 +169,9 @@ static int uv_sculpt_brush_poll(bContext *C)
if (!uv_sculpt_brush(C) || !obedit || obedit->type != OB_MESH ||
!sima || ED_space_image_show_render(sima) || (sima->mode == SI_MODE_PAINT))
{
return 0;
}
em = BKE_editmesh_from_object(obedit);
ret = EDBM_mtexpoly_check(em);

14
source/blender/editors/transform/transform_snap.c
View File

@@ -1572,8 +1572,8 @@ static bool snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMes
}
if (treeData.tree &&
BLI_bvhtree_ray_cast(treeData.tree, ray_start_local, ray_normal_local, 0.0f,
&hit, treeData.raycast_callback, &treeData) != -1)
BLI_bvhtree_ray_cast(treeData.tree, ray_start_local, ray_normal_local, 0.0f,
&hit, treeData.raycast_callback, &treeData) != -1)
{
hit.dist += len_diff;
hit.dist /= local_scale;
@@ -1624,8 +1624,8 @@ static bool snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMes
else {
eve = BM_vert_at_index(em->bm, index);
if ((BM_elem_flag_test(eve, BM_ELEM_HIDDEN) ||
BM_elem_flag_test(eve, BM_ELEM_SELECT)))
if (BM_elem_flag_test(eve, BM_ELEM_HIDDEN) ||
BM_elem_flag_test(eve, BM_ELEM_SELECT))
{
test = false;
}
@@ -1672,9 +1672,9 @@ static bool snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMes
else {
BMEdge *eed = BM_edge_at_index(em->bm, index);
if ((BM_elem_flag_test(eed, BM_ELEM_HIDDEN) ||
BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) ||
BM_elem_flag_test(eed->v2, BM_ELEM_SELECT)))
if (BM_elem_flag_test(eed, BM_ELEM_HIDDEN) ||
BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) ||
BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))
{
test = false;
}

8
source/blender/makesrna/intern/rna_cloth.c
View File

@@ -102,7 +102,7 @@ static void rna_ClothSettings_max_struct_set(struct PointerRNA *ptr, float value
static void rna_ClothSettings_max_sewing_set(struct PointerRNA *ptr, float value)
{
ClothSimSettings *settings = (ClothSimSettings*)ptr->data;
ClothSimSettings *settings = (ClothSimSettings *)ptr->data;
/* check for clipping */
if (value < 0.0f)
@@ -131,19 +131,19 @@ static void rna_ClothSettings_mass_vgroup_set(PointerRNA *ptr, const char *value
static void rna_ClothSettings_shrink_vgroup_get(PointerRNA *ptr, char *value)
{
ClothSimSettings *sim = (ClothSimSettings*)ptr->data;
ClothSimSettings *sim = (ClothSimSettings *)ptr->data;
rna_object_vgroup_name_index_get(ptr, value, sim->vgroup_shrink);
}
static int rna_ClothSettings_shrink_vgroup_length(PointerRNA *ptr)
{
ClothSimSettings *sim = (ClothSimSettings*)ptr->data;
ClothSimSettings *sim = (ClothSimSettings *)ptr->data;
return rna_object_vgroup_name_index_length(ptr, sim->vgroup_shrink);
}
static void rna_ClothSettings_shrink_vgroup_set(PointerRNA *ptr, const char *value)
{
ClothSimSettings *sim = (ClothSimSettings*)ptr->data;
ClothSimSettings *sim = (ClothSimSettings *)ptr->data;
rna_object_vgroup_name_index_set(ptr, value, &sim->vgroup_shrink);
}