diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-15 07:11:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-15 07:11:48 +0400 |
commit | ea610e655cd8b8f9fb97f0a9a4fc5fd46418bd9e (patch) | |
tree | c1a3582f1167f778bf5845e64e127c0560b0c42e /release | |
parent | 3cf39fc72a36bab1c5b82ae96cffe7dd01ce7260 (diff) |
Style cleanup: C & pep8
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/modules/bpy/ops.py | 6 | ||||
-rw-r--r-- | release/scripts/templates_py/custom_nodes.py | 13 | ||||
-rw-r--r-- | release/scripts/templates_py/operator_modal_view3d_raycast.py | 1 | ||||
-rw-r--r-- | release/scripts/templates_py/ui_panel.py | 8 |
4 files changed, 16 insertions, 12 deletions
diff --git a/release/scripts/modules/bpy/ops.py b/release/scripts/modules/bpy/ops.py index e457c087ab8..2be2abc6383 100644 --- a/release/scripts/modules/bpy/ops.py +++ b/release/scripts/modules/bpy/ops.py @@ -204,8 +204,10 @@ class BPyOpsSubModOp(object): import bpy idname = self.idname() as_string = op_as_string(idname) - # XXX You never quite know what you get from bpy.types, with operators... Operator and OperatorProperties - # are shadowing each other, and not in the same way for native ops and py ones! See T39158. + # XXX You never quite know what you get from bpy.types, + # with operators... Operator and OperatorProperties + # are shadowing each other, and not in the same way for + # native ops and py ones! See T39158. # op_class = getattr(bpy.types, idname) op_class = op_get_rna(idname) descr = op_class.bl_rna.description diff --git a/release/scripts/templates_py/custom_nodes.py b/release/scripts/templates_py/custom_nodes.py index bf89c0debad..992ef734859 100644 --- a/release/scripts/templates_py/custom_nodes.py +++ b/release/scripts/templates_py/custom_nodes.py @@ -49,13 +49,15 @@ class MyCustomSocket(NodeSocket): def draw_color(self, context, node): return (1.0, 0.4, 0.216, 0.5) + # Mix-in class for all custom nodes in this tree type. # Defines a poll function to enable instantiation. -class MyCustomTreeNode : +class MyCustomTreeNode: @classmethod def poll(cls, ntree): return ntree.bl_idname == 'CustomTreeType' + # Derived from the Node base type. class MyCustomNode(Node, MyCustomTreeNode): # === Basics === @@ -123,6 +125,7 @@ class MyCustomNode(Node, MyCustomTreeNode): import nodeitems_utils from nodeitems_utils import NodeCategory, NodeItem + # our own base class with an appropriate poll function, # so the categories only show up in our own tree type class MyNodeCategory(NodeCategory): @@ -143,12 +146,12 @@ node_categories = [ # NB: settings values are stored as string expressions, # for this reason they should be converted to strings using repr() NodeItem("CustomNodeType", label="Node A", settings={ - "myStringProperty" : repr("Lorem ipsum dolor sit amet"), - "myFloatProperty" : repr(1.0), + "myStringProperty": repr("Lorem ipsum dolor sit amet"), + "myFloatProperty": repr(1.0), }), NodeItem("CustomNodeType", label="Node B", settings={ - "myStringProperty" : repr("consectetur adipisicing elit"), - "myFloatProperty" : repr(2.0), + "myStringProperty": repr("consectetur adipisicing elit"), + "myFloatProperty": repr(2.0), }), ]), ] diff --git a/release/scripts/templates_py/operator_modal_view3d_raycast.py b/release/scripts/templates_py/operator_modal_view3d_raycast.py index eac76922187..4d0355047f4 100644 --- a/release/scripts/templates_py/operator_modal_view3d_raycast.py +++ b/release/scripts/templates_py/operator_modal_view3d_raycast.py @@ -16,7 +16,6 @@ def main(context, event, ray_max=10000.0): ray_origin = view3d_utils.region_2d_to_origin_3d(region, rv3d, coord) ray_target = ray_origin + (view_vector * ray_max) - def visible_objects_and_duplis(): """Loop over (object, matrix) pairs (mesh only)""" diff --git a/release/scripts/templates_py/ui_panel.py b/release/scripts/templates_py/ui_panel.py index cacdb83e815..855d05700c5 100644 --- a/release/scripts/templates_py/ui_panel.py +++ b/release/scripts/templates_py/ui_panel.py @@ -42,22 +42,22 @@ class LayoutDemoPanel(bpy.types.Panel): col.label(text="Column Two:") col.prop(scene, "frame_start") col.prop(scene, "frame_end") - + # Big render button layout.label(text="Big Button:") row = layout.row() row.scale_y = 3.0 row.operator("render.render") - + # Different sizes in a row layout.label(text="Different button sizes:") row = layout.row(align=True) row.operator("render.render") - + sub = row.row() sub.scale_x = 2.0 sub.operator("render.render") - + row.operator("render.render") |