[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41923] trunk/blender: minor cleanup
Campbell Barton
ideasman42 at gmail.com
Wed Nov 16 17:38:37 CET 2011
Revision: 41923
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41923
Author: campbellbarton
Date: 2011-11-16 16:38:37 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
minor cleanup
- remove / comment unused python vars
- replace mul_v3_fl(somevec, -1.0f); with negate_v3(somevec);
Modified Paths:
--------------
trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/release/scripts/modules/bpy/path.py
trunk/blender/release/scripts/presets/camera/Sony_A55.py
trunk/blender/release/scripts/startup/bl_operators/clip.py
trunk/blender/release/scripts/startup/bl_operators/image.py
trunk/blender/release/scripts/startup/bl_operators/wm.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
trunk/blender/release/scripts/startup/bl_ui/space_clip.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
Modified: trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-11-16 16:28:19 UTC (rev 41922)
+++ trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-11-16 16:38:37 UTC (rev 41923)
@@ -139,9 +139,9 @@
# not used
# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+ENDIF()
- MARK_AS_ADVANCED(
- PYTHON_INCLUDE_DIR
- PYTHON_LIBRARY
- )
-ENDIF()
+MARK_AS_ADVANCED(
+ PYTHON_INCLUDE_DIR
+ PYTHON_LIBRARY
+)
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2011-11-16 16:28:19 UTC (rev 41922)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2011-11-16 16:38:37 UTC (rev 41923)
@@ -459,7 +459,7 @@
@classmethod
def poll(cls, context):
- world = context.world
+ # world = context.world
return False # world and world.node_tree and CyclesButtonsPanel.poll(context)
def draw(self, context):
@@ -493,7 +493,7 @@
@classmethod
def poll(cls, context):
- mat = context.material
+ # mat = context.material
return False # mat and mat.node_tree and CyclesButtonsPanel.poll(context)
def draw(self, context):
@@ -562,7 +562,7 @@
pin_id = space.pin_id
use_pin_id = space.use_pin_id
user = context.texture_user
- node = context.texture_node
+ # node = context.texture_node
if not use_pin_id or not isinstance(pin_id, bpy.types.Texture):
pin_id = None
@@ -638,7 +638,7 @@
def draw(self, context):
layout = self.layout
- tex = context.texture
+ # tex = context.texture
node = context.texture_node
mapping = node.texture_mapping
@@ -664,15 +664,15 @@
@classmethod
def poll(cls, context):
- tex = context.texture
- node = context.texture_node
+ # tex = context.texture
+ # node = context.texture_node
return False
#return (node or (tex and tex.use_nodes)) and CyclesButtonsPanel.poll(context)
def draw(self, context):
layout = self.layout
- tex = context.texture
+ # tex = context.texture
node = context.texture_node
mapping = node.color_mapping
Modified: trunk/blender/release/scripts/modules/bpy/path.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/path.py 2011-11-16 16:28:19 UTC (rev 41922)
+++ trunk/blender/release/scripts/modules/bpy/path.py 2011-11-16 16:38:37 UTC (rev 41923)
@@ -154,25 +154,23 @@
returning a string with the path if found else return the original path.
"""
- import os
-
def _ncase_path_found(path):
- if not path or os.path.exists(path):
+ if not path or _os.path.exists(path):
return path, True
# filename may be a directory or a file
- filename = os.path.basename(path)
- dirpath = os.path.dirname(path)
+ filename = _os.path.basename(path)
+ dirpath = _os.path.dirname(path)
suffix = path[:0] # "" but ensure byte/str match
if not filename: # dir ends with a slash?
if len(dirpath) < len(path):
suffix = path[:len(path) - len(dirpath)]
- filename = os.path.basename(dirpath)
- dirpath = os.path.dirname(dirpath)
+ filename = _os.path.basename(dirpath)
+ dirpath = _os.path.dirname(dirpath)
- if not os.path.exists(dirpath):
+ if not _os.path.exists(dirpath):
if dirpath == path:
return path, False
@@ -184,8 +182,8 @@
# at this point, the directory exists but not the file
# we are expecting 'dirpath' to be a directory, but it could be a file
- if os.path.isdir(dirpath):
- files = os.listdir(dirpath)
+ if _os.path.isdir(dirpath):
+ files = _os.listdir(dirpath)
else:
return path, False
@@ -198,7 +196,7 @@
break
if f_iter_nocase:
- return os.path.join(dirpath, f_iter_nocase) + suffix, True
+ return _os.path.join(dirpath, f_iter_nocase) + suffix, True
else:
# cant find the right one, just return the path as is.
return path, False
@@ -216,8 +214,7 @@
:arg case_sensitive: Check for matching case when comparing extensions.
:type case_sensitive: bool
"""
- import os
- fn_base, fn_ext = os.path.splitext(filepath)
+ fn_base, fn_ext = _os.path.splitext(filepath)
if fn_base and fn_ext:
if ((case_sensitive and ext == fn_ext) or
(ext.lower() == fn_ext.lower())):
Modified: trunk/blender/release/scripts/presets/camera/Sony_A55.py
===================================================================
--- trunk/blender/release/scripts/presets/camera/Sony_A55.py 2011-11-16 16:28:19 UTC (rev 41922)
+++ trunk/blender/release/scripts/presets/camera/Sony_A55.py 2011-11-16 16:38:37 UTC (rev 41923)
@@ -2,4 +2,3 @@
bpy.context.object.data.sensor_width = 23.4
bpy.context.object.data.sensor_height = 15.6
bpy.context.object.data.sensor_fit = 'HORIZONTAL'
-
Modified: trunk/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/clip.py 2011-11-16 16:28:19 UTC (rev 41922)
+++ trunk/blender/release/scripts/startup/bl_operators/clip.py 2011-11-16 16:38:37 UTC (rev 41923)
@@ -86,14 +86,9 @@
@classmethod
def poll(cls, context):
- if context.space_data.type != 'CLIP_EDITOR':
- return False
-
sc = context.space_data
- clip = sc.clip
+ return (sc.type == 'CLIP_EDITOR') and sc.clip
- return clip
-
def execute(self, context):
sc = context.space_data
clip = sc.clip
Modified: trunk/blender/release/scripts/startup/bl_operators/image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/image.py 2011-11-16 16:28:19 UTC (rev 41922)
+++ trunk/blender/release/scripts/startup/bl_operators/image.py 2011-11-16 16:38:37 UTC (rev 41923)
@@ -147,7 +147,7 @@
# opengl buffer may fail, we can't help this, but best report it.
try:
- ret = bpy.ops.paint.image_from_view()
+ bpy.ops.paint.image_from_view()
except RuntimeError as err:
self.report({'ERROR'}, str(err))
return {'CANCELLED'}
Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py 2011-11-16 16:28:19 UTC (rev 41922)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py 2011-11-16 16:38:37 UTC (rev 41923)
@@ -106,7 +106,7 @@
# luckily we don't do this!
#
# When we cant find the data owner assume no undo is needed.
- data_path_head, data_path_sep, data_path_tail = data_path.rpartition(".")
+ data_path_head = data_path.rpartition(".")[0]
if not data_path_head:
return False
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py 2011-11-16 16:28:19 UTC (rev 41922)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py 2011-11-16 16:38:37 UTC (rev 41923)
@@ -46,7 +46,6 @@
layout = self.layout
md = context.dynamic_paint
- ob = context.object
layout.prop(md, "ui_type", expand=True)
@@ -129,7 +128,6 @@
canvas = context.dynamic_paint.canvas_settings
surface = canvas.canvas_surfaces.active
- ob = context.object
surface_type = surface.surface_type
@@ -370,8 +368,6 @@
md.canvas_settings.canvas_surfaces.active.is_cache_user)
def draw(self, context):
- layout = self.layout
-
surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active
cache = surface.point_cache
@@ -442,7 +438,6 @@
layout = self.layout
brush = context.dynamic_paint.brush_settings
- ob = context.object
split = layout.split()
@@ -478,7 +473,6 @@
layout = self.layout
brush = context.dynamic_paint.brush_settings
- ob = context.object
layout.prop(brush, "wave_type")
if brush.wave_type != 'REFLECT':
Modified: trunk/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_clip.py 2011-11-16 16:28:19 UTC (rev 41922)
+++ trunk/blender/release/scripts/startup/bl_ui/space_clip.py 2011-11-16 16:38:37 UTC (rev 41923)
@@ -115,7 +115,6 @@
def draw(self, context):
layout = self.layout
clip = context.space_data.clip
- settings = clip.tracking.settings
row = layout.row(align=True)
@@ -641,7 +640,6 @@
def draw(self, context):
layout = self.layout
- clip = context.space_data.clip
layout.operator("clip.set_viewport_background")
@@ -698,9 +696,6 @@
def draw(self, context):
layout = self.layout
- sc = context.space_data
- clip = sc.clip
-
layout.operator("clip.rebuild_proxy")
layout.operator("clip.delete_proxy")
@@ -805,8 +800,6 @@
def draw(self, context):
layout = self.layout
- sc = context.space_data
-
layout.operator("clip.select_border")
layout.operator("clip.select_circle")
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-11-16 16:28:19 UTC (rev 41922)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-11-16 16:38:37 UTC (rev 41923)
@@ -2276,12 +2276,6 @@
bl_label = "Background Images"
bl_options = {'DEFAULT_CLOSED'}
- @classmethod
- def poll(cls, context):
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list