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

style cleanup: pep8 & unfinished comment from own commit.

Browse Source
This commit is contained in:
Campbell Barton
2012-08-14 18:43:15 +00:00
parent 8b941a80c9
commit 27a8487070
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
release/scripts/startup/bl_operators/node.py
View File

@@ -36,6 +36,7 @@ node_type_items_dict = {}
node_type_prefix = 'NODE_' node_type_prefix = 'NODE_'
node_group_prefix = 'GROUP_' node_group_prefix = 'GROUP_'
# Generate a list of enum items for a given node class # Generate a list of enum items for a given node class
# Copy existing type enum, adding a prefix to distinguish from node groups # Copy existing type enum, adding a prefix to distinguish from node groups
# Skip the base node group type, node groups will be added below for all existing group trees # Skip the base node group type, node groups will be added below for all existing group trees
@@ -43,13 +44,15 @@ def node_type_items(node_class):
return [(node_type_prefix + item.identifier, item.name, item.description) return [(node_type_prefix + item.identifier, item.name, item.description)
for item in node_class.bl_rna.properties['type'].enum_items if item.identifier != 'GROUP'] for item in node_class.bl_rna.properties['type'].enum_items if item.identifier != 'GROUP']
# Generate items for node group types # Generate items for node group types
# Filter by the given tree_type # Filter by the given tree_type
# Node group trees don't have a description property yet (could add this as a custom property though) # Node group trees don't have a description property yet (could add this as a custom property though)
def node_group_items(tree_type): def node_group_items(tree_type):
return [(node_group_prefix + group.name, group.name, '') return [(node_group_prefix + group.name, group.name, '')
for group in bpy.data.node_groups if group.type == tree_type] for group in bpy.data.node_groups if group.type == tree_type]
# Returns the enum item list for the edited tree in the context # Returns the enum item list for the edited tree in the context
def node_type_items_cb(self, context): def node_type_items_cb(self, context):
snode = context.space_data snode = context.space_data
@@ -59,7 +62,7 @@ def node_type_items_cb(self, context):
if not tree: if not tree:
return [] return []
# Lists of basic node types for each # Lists of basic node types for each
if not node_type_items_dict: if not node_type_items_dict:
node_type_items_dict.update({ node_type_items_dict.update({
'SHADER': node_type_items(bpy.types.ShaderNode), 'SHADER': node_type_items(bpy.types.ShaderNode),
@@ -119,7 +122,7 @@ class NODE_OT_add_search(Operator):
def poll(cls, context): def poll(cls, context):
space = context.space_data space = context.space_data
# needs active node editor and a tree to add nodes to # needs active node editor and a tree to add nodes to
return space.type == 'NODE_EDITOR' and space.edit_tree return (space.type == 'NODE_EDITOR' and space.edit_tree)
def execute(self, context): def execute(self, context):
self.create_node(context) self.create_node(context)
@@ -146,7 +149,7 @@ class NODE_OT_collapse_hide_unused_toggle(Operator):
def poll(cls, context): def poll(cls, context):
space = context.space_data space = context.space_data
# needs active node editor and a tree # needs active node editor and a tree
return space.type == 'NODE_EDITOR' and space.edit_tree return (space.type == 'NODE_EDITOR' and space.edit_tree)
def execute(self, context): def execute(self, context):
space = context.space_data space = context.space_data
@@ -154,14 +157,13 @@ class NODE_OT_collapse_hide_unused_toggle(Operator):
for node in tree.nodes: for node in tree.nodes:
if node.select: if node.select:
hide = not node.hide hide = (not node.hide)
node.hide = hide node.hide = hide
# Note: connected sockets are ignored internally # Note: connected sockets are ignored internally
for socket in node.inputs: for socket in node.inputs:
socket.hide = hide socket.hide = hide
for socket in node.outputs: for socket in node.outputs:
socket.hide = hide socket.hide = hide
return {'FINISHED'}
return {'FINISHED'}

2
source/blender/modifiers/intern/MOD_displace.c
View File

@@ -175,7 +175,7 @@ static void displaceModifier_do(
int defgrp_index; int defgrp_index;
float (*tex_co)[3]; float (*tex_co)[3];
float weight = 1.0f; /* init value unused but some compilers may complain */ float weight = 1.0f; /* init value unused but some compilers may complain */
const float delta_fixed = 1.0f - dmd->midlevel; /* when no texture is used, we*/ const float delta_fixed = 1.0f - dmd->midlevel; /* when no texture is used, we fallback to white */
if (!dmd->texture && dmd->direction == MOD_DISP_DIR_RGB_XYZ) return; if (!dmd->texture && dmd->direction == MOD_DISP_DIR_RGB_XYZ) return;
if (dmd->strength == 0.0f) return; if (dmd->strength == 0.0f) return;