[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36910] trunk/blender: correct spelling error and some pep8 changes.
Campbell Barton
ideasman42 at gmail.com
Thu May 26 11:33:52 CEST 2011
Revision: 36910
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36910
Author: campbellbarton
Date: 2011-05-26 09:33:51 +0000 (Thu, 26 May 2011)
Log Message:
-----------
correct spelling error and some pep8 changes.
Modified Paths:
--------------
trunk/blender/build_files/cmake/cmake_netbeans_project.py
trunk/blender/build_files/cmake/cmake_qtcreator_project.py
trunk/blender/build_files/cmake/project_info.py
trunk/blender/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py
trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
trunk/blender/release/scripts/startup/bl_ui/space_image.py
Modified: trunk/blender/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_netbeans_project.py 2011-05-26 09:20:30 UTC (rev 36909)
+++ trunk/blender/build_files/cmake/cmake_netbeans_project.py 2011-05-26 09:33:51 UTC (rev 36910)
@@ -33,7 +33,7 @@
from project_info import *
import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
+from os.path import join, dirname, normpath, relpath, exists
def create_nb_project_main():
@@ -50,7 +50,6 @@
includes.sort()
PROJECT_NAME = "Blender"
- FILE_NAME = PROJECT_NAME.lower()
# --------------- NB spesific
defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
@@ -76,7 +75,7 @@
if not exists(PROJECT_DIR_NB):
os.mkdir(PROJECT_DIR_NB)
- SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
+ # SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
f = open(join(PROJECT_DIR_NB, "project.xml"), 'w')
Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-05-26 09:20:30 UTC (rev 36909)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-05-26 09:33:51 UTC (rev 36910)
@@ -34,54 +34,52 @@
from project_info import *
import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
-
import sys
def create_qtc_project_main():
files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
- files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+ files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
files_rel.sort()
# --- qtcreator specific, simple format
if SIMPLE_PROJECTFILE:
# --- qtcreator specific, simple format
PROJECT_NAME = "Blender"
- f = open(join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
f.write("\n".join(files_rel))
- f = open(join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
- f.write("\n".join(sorted(list(set(dirname(f) for f in files_rel if is_c_header(f))))))
+ f = open(os.path.join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
+ f.write("\n".join(sorted(list(set(os.path.dirname(f) for f in files_rel if is_c_header(f))))))
- qtc_prj = join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
+ qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
f = open(qtc_prj, 'w')
f.write("[General]\n")
- qtc_cfg = join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
- if not exists(qtc_cfg):
+ qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
+ if not os.path.exists(qtc_cfg):
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
else:
includes, defines = cmake_advanced_info()
# for some reason it doesnt give all internal includes
- includes = list(set(includes) | set(dirname(f) for f in files_rel if is_c_header(f)))
+ includes = list(set(includes) | set(os.path.dirname(f) for f in files_rel if is_c_header(f)))
includes.sort()
PROJECT_NAME = "Blender"
FILE_NAME = PROJECT_NAME.lower()
- f = open(join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
f.write("\n".join(files_rel))
- f = open(join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
f.write("\n".join(sorted(includes)))
- qtc_prj = join(PROJECT_DIR, "%s.creator" % FILE_NAME)
+ qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
f = open(qtc_prj, 'w')
f.write("[General]\n")
- qtc_cfg = join(PROJECT_DIR, "%s.config" % FILE_NAME)
+ qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
defines_final = [("#define %s %s" % item) for item in defines]
@@ -95,21 +93,21 @@
def create_qtc_project_python():
files = list(source_list(SOURCE_DIR, filename_check=is_py))
- files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+ files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
files_rel.sort()
# --- qtcreator specific, simple format
PROJECT_NAME = "Blender_Python"
FILE_NAME = PROJECT_NAME.lower()
- f = open(join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
f.write("\n".join(files_rel))
- qtc_prj = join(PROJECT_DIR, "%s.creator" % FILE_NAME)
+ qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
f = open(qtc_prj, 'w')
f.write("[General]\n")
- qtc_cfg = join(PROJECT_DIR, "%s.config" % FILE_NAME)
- if not exists(qtc_cfg):
+ qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
+ if not os.path.exists(qtc_cfg):
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
Modified: trunk/blender/build_files/cmake/project_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_info.py 2011-05-26 09:20:30 UTC (rev 36909)
+++ trunk/blender/build_files/cmake/project_info.py 2011-05-26 09:33:51 UTC (rev 36910)
@@ -46,7 +46,7 @@
import sys
import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
+from os.path import join, dirname, normpath, abspath, splitext, exists
SOURCE_DIR = join(dirname(__file__), "..", "..")
SOURCE_DIR = normpath(SOURCE_DIR)
Modified: trunk/blender/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
===================================================================
--- trunk/blender/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py 2011-05-26 09:20:30 UTC (rev 36909)
+++ trunk/blender/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py 2011-05-26 09:33:51 UTC (rev 36910)
@@ -23,7 +23,7 @@
setattr(data_to, attr, getattr(data_from, attr))
-# the 'data_to' variables lists are
+# the 'data_to' variables lists are
with bpy.data.libraries.load(filepath) as (data_from, data_to):
data_to.scenes = ["Scene"]
Modified: trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2011-05-26 09:20:30 UTC (rev 36909)
+++ trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2011-05-26 09:33:51 UTC (rev 36910)
@@ -162,6 +162,7 @@
return edge_loops
+
def edge_loops_from_edges(mesh, edges=None):
"""
Edge loops defined by edges
@@ -227,8 +228,7 @@
return line_polys
-
-def ngon_tessellate(from_data, indices, fix_loops=True):
+def ngon_tesselate(from_data, indices, fix_loops=True):
'''
Takes a polyline of indices (fgon)
and returns a list of face indicie lists.
@@ -238,7 +238,7 @@
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.
fix_loops: If this is enabled polylines that use loops to make multiple polylines are delt with correctly.
'''
-
+
from mathutils import Vector
vector_to_tuple = Vector.to_tuple
Modified: trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py 2011-05-26 09:20:30 UTC (rev 36909)
+++ trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py 2011-05-26 09:33:51 UTC (rev 36910)
@@ -45,7 +45,7 @@
))
w = (out[0] * persinv[0][3]) + (out[1] * persinv[1][3]) + (out[2] * persinv[2][3]) + persinv[3][3]
-
+
return ((out * persinv) / w) - rv3d.view_matrix.inverted()[3].xyz
else:
return rv3d.view_matrix.inverted()[2].xyz.normalized()
Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py 2011-05-26 09:20:30 UTC (rev 36909)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py 2011-05-26 09:33:51 UTC (rev 36910)
@@ -26,7 +26,7 @@
def extend(obj, operator, EXTEND_MODE):
from bpy_extras import mesh_utils
-
+
me = obj.data
me_verts = me.vertices
# script will fail without UVs
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py 2011-05-26 09:20:30 UTC (rev 36909)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py 2011-05-26 09:33:51 UTC (rev 36910)
@@ -44,9 +44,9 @@
# layout.template_image(ob, "data", None)
layout.template_ID(ob, "data", open="image.open", unlink="image.unlink")
- row = layout.row(align = True)
+ row = layout.row(align=True)
row.prop(ob, "color", text="Transparency", index=3, slider=True)
- row = layout.row(align = True)
+ row = layout.row(align=True)
row.prop(ob, "empty_image_offset", text="Offset X", index=0)
row.prop(ob, "empty_image_offset", text="Offset Y", index=1)
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2011-05-26 09:20:30 UTC (rev 36909)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2011-05-26 09:33:51 UTC (rev 36910)
@@ -666,9 +666,9 @@
row = col.row()
row.prop(con, "map_to_z_from", expand=False, text="")
row.label(text=" -> Z")
-
+
split = layout.split()
-
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list