[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55863] trunk/blender: freestyle lineset `tag` attribute was defined but not used, also some code cleanup.
Campbell Barton
ideasman42 at gmail.com
Sun Apr 7 03:38:05 CEST 2013
Revision: 55863
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55863
Author: campbellbarton
Date: 2013-04-07 01:38:03 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
freestyle lineset `tag` attribute was defined but not used, also some code cleanup.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
trunk/blender/release/scripts/modules/bpy_extras/object_utils.py
trunk/blender/release/scripts/startup/bl_operators/object.py
trunk/blender/release/scripts/startup/bl_ui/properties_freestyle.py
trunk/blender/release/scripts/startup/bl_ui/properties_object.py
trunk/blender/release/scripts/startup/bl_ui/properties_paint_common.py
trunk/blender/release/scripts/startup/bl_ui/space_image.py
trunk/blender/release/scripts/startup/bl_ui/space_node.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/python/bmesh/bmesh_py_ops.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/tests/bl_load_addons.py
trunk/blender/source/tests/pep8.py
trunk/blender/source/tools/check_style_c_config.py
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -267,6 +267,7 @@
row.prop(rl, "name")
row.prop(rd, "use_single_layer", text="", icon_only=True)
+
class CyclesRender_PT_layer_options(CyclesButtonsPanel, Panel):
bl_label = "Layer"
bl_context = "render_layer"
@@ -297,7 +298,8 @@
col = split.column()
col.prop(rl, "samples")
col.prop(rl, "use_sky", "Use Environment")
-
+
+
class CyclesRender_PT_layer_passes(CyclesButtonsPanel, Panel):
bl_label = "Passes"
bl_context = "render_layer"
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -654,8 +654,9 @@
:type prop_name: string
:arg enum_name: Name of a RNA enum identifier.
:type enum_name: string
- :return: A triple of three "RNA paths" (most_complete_path, "struct.prop", "struct.prop:'enum'").
- If no enum_name is given, the third element will always be void.
+ :return: A triple of three "RNA paths"
+ (most_complete_path, "struct.prop", "struct.prop:'enum'").
+ If no enum_name is given, the third element will always be void.
:rtype: tuple of strings
"""
src = src_rna = src_enum = ""
Modified: trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -328,10 +328,12 @@
fgon to create from existing verts.
from_data: either a mesh, or a list/tuple of vectors.
- :arg indices: a list of indices to use this list is the ordered closed polyline
+ :arg indices: a list of indices to use this list
+ is the ordered closed polyline
to fill, and can be a subset of the data given.
:type indices: list
- :arg fix_loops: If this is enabled polylines that use loops to make multiple
+ :arg fix_loops: If this is enabled polylines
+ that use loops to make multiple
polylines are delt with correctly.
:type fix_loops: bool
"""
Modified: trunk/blender/release/scripts/modules/bpy_extras/object_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/object_utils.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/release/scripts/modules/bpy_extras/object_utils.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -191,7 +191,8 @@
def object_add_grid_scale(context):
"""
- Return scale which should be applied on object data to align it to grid scale
+ Return scale which should be applied on object
+ data to align it to grid scale
"""
space_data = context.space_data
Modified: trunk/blender/release/scripts/startup/bl_operators/object.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/release/scripts/startup/bl_operators/object.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -473,7 +473,8 @@
class JoinUVs(Operator):
- """Transfer UV Layouts from active to selected objects (needs matching geometry)"""
+ """Transfer UV Layouts from active to selected objects """ \
+ """(needs matching geometry)"""
bl_idname = "object.join_uvs"
bl_label = "Transfer UV Layouts"
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_freestyle.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_freestyle.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_freestyle.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -93,7 +93,7 @@
layout.label("", icon_value=icon)
##ifdef WITH_FREESTYLE
-# else if (RNA_struct_is_a(itemptr->type, &RNA_SceneRenderLayer) ||
+# else if (RNA_struct_is_a(itemptr->type, &RNA_SceneRenderLayer) ||
# RNA_struct_is_a(itemptr->type, &RNA_FreestyleLineSet)) {
##else
# else if (RNA_struct_is_a(itemptr->type, &RNA_SceneRenderLayer)) {
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_object.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_object.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -222,9 +222,9 @@
col = split.column()
col.prop(obj, "show_name", text="Name")
col.prop(obj, "show_axis", text="Axis")
-
+
obj_type = obj.type
-
+
if obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'}:
# Makes no sense for cameras, armtures, etc.!
col.prop(obj, "show_wire", text="Wire")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_paint_common.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_paint_common.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_paint_common.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -82,7 +82,7 @@
else:
layout.row().prop(tex_slot, "tex_paint_map_mode", text="")
layout.separator()
-
+
if tex_slot.map_mode == 'STENCIL':
layout.operator("brush.stencil_fit_image_aspect")
Modified: trunk/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_image.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/release/scripts/startup/bl_ui/space_image.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -786,7 +786,7 @@
col = layout.column()
col.label(text="Stroke Method:")
-
+
col.prop(brush, "stroke_method", text="")
if brush.use_anchor:
@@ -804,7 +804,6 @@
row.prop(brush, "spacing", text="Spacing")
row.prop(brush, "use_pressure_spacing", toggle=True, text="")
-
col = layout.column()
col.separator()
Modified: trunk/blender/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_node.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/release/scripts/startup/bl_ui/space_node.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -151,7 +151,7 @@
layout.operator("node.select_all", text="Inverse").action = 'INVERT'
layout.operator("node.select_linked_from")
layout.operator("node.select_linked_to")
-
+
layout.separator()
layout.operator("node.select_same_type")
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -1641,12 +1641,12 @@
def draw(self, context):
layout = self.layout
-
- layout.operator("paint.weight_from_bones", text="Assign Automatic from Bones").type="AUTOMATIC"
- layout.operator("paint.weight_from_bones", text="Assign from Bone Envelopes").type="ENVELOPES"
-
+
+ layout.operator("paint.weight_from_bones", text="Assign Automatic from Bones").type = 'AUTOMATIC'
+ layout.operator("paint.weight_from_bones", text="Assign from Bone Envelopes").type = 'ENVELOPES'
+
layout.separator()
-
+
layout.operator("pose.select_constraint_target")
layout.operator("pose.flip_names")
layout.operator("pose.paths_calculate")
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-04-07 01:38:03 UTC (rev 55863)
@@ -707,7 +707,7 @@
self.prop_unified_strength(row, context, brush, "use_pressure_strength")
row = col.row(align=True)
-
+
col.prop(brush, "vertex_tool", text="Blend")
# Vertex Paint Mode #
@@ -815,7 +815,7 @@
col = layout.column()
col.label(text="Stroke Method:")
-
+
if context.sculpt_object:
col.prop(brush, "sculpt_stroke_method", text="")
else:
@@ -880,6 +880,7 @@
sub.prop(brush, "smooth_stroke_radius", text="Radius", slider=True)
sub.prop(brush, "smooth_stroke_factor", text="Factor", slider=True)
+
class VIEW3D_PT_tools_brush_curve(Panel, View3DPaintPanel):
bl_label = "Curve"
bl_options = {'DEFAULT_CLOSED'}
Modified: trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp 2013-04-07 01:18:52 UTC (rev 55862)
+++ trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp 2013-04-07 01:38:03 UTC (rev 55863)
@@ -58,7 +58,7 @@
output[2] = valuem * (inputColor1[2]) + value * tmpb;
}
else {
- copy_v3_v3(output, inputColor1);
+ copy_v3_v3(output, inputColor1);
}
output[3] = inputColor1[3];
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2013-04-07 01:18:52 UTC (rev 55862)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list