[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40413] trunk/blender: pep8 update & some minor cmake edits.
Campbell Barton
ideasman42 at gmail.com
Tue Sep 20 20:29:20 CEST 2011
Revision: 40413
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40413
Author: campbellbarton
Date: 2011-09-20 18:29:19 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
pep8 update & some minor cmake edits.
Modified Paths:
--------------
trunk/blender/build_files/buildbot/master_unpack.py
trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
trunk/blender/build_files/cmake/cmake_static_check_splint.py
trunk/blender/build_files/cmake/project_source_info.py
trunk/blender/doc/python_api/sphinx_doc_gen.py
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/release/scripts/startup/bl_ui/properties_game.py
trunk/blender/release/scripts/startup/bl_ui/properties_material.py
trunk/blender/release/scripts/startup/bl_ui/properties_object.py
trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/release/scripts/startup/bl_ui/space_text.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
trunk/blender/source/tests/bl_load_py_modules.py
Modified: trunk/blender/build_files/buildbot/master_unpack.py
===================================================================
--- trunk/blender/build_files/buildbot/master_unpack.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/build_files/buildbot/master_unpack.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -52,7 +52,7 @@
platform_tokens = []
found = False
- for i, token in enumerate(tokens):
+ for token in tokens:
if not found:
for platform in platforms:
if platform in token.lower():
Modified: trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -43,6 +43,7 @@
# "--enable=all", # if you want sixty hundred pedantic suggestions
]
+
def main():
source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
@@ -58,12 +59,12 @@
check_commands.append((c, cmd))
for i, (c, cmd) in enumerate(check_commands):
- percent = 100.0 * (i / (len(check_commands)-1))
+ percent = 100.0 * (i / (len(check_commands) - 1))
percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
-
+
# if percent < 27.9:
# continue
-
+
# let cppcheck finish the line off...
sys.stdout.write("%s " % percent_str)
Modified: trunk/blender/build_files/cmake/cmake_static_check_splint.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_splint.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/build_files/cmake/cmake_static_check_splint.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -58,9 +58,9 @@
# re-definitions, rna causes most of these
"-redef",
"-syntax",
-
+
# dummy, witjout this splint complains with:
- # /usr/include/bits/confname.h:31:27: *** Internal Bug at cscannerHelp.c:2428: Unexpanded macro not function or constant: int _PC_MAX_CANON
+ # /usr/include/bits/confname.h:31:27: *** Internal Bug at cscannerHelp.c:2428: Unexpanded macro not function or constant: int _PC_MAX_CANON
"-D_PC_MAX_CANON=0",
]
Modified: trunk/blender/build_files/cmake/project_source_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_source_info.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/build_files/cmake/project_source_info.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -27,7 +27,6 @@
)
import os
-import sys
from os.path import join, dirname, normpath, abspath
SOURCE_DIR = join(dirname(__file__), "..", "..")
@@ -40,11 +39,6 @@
return (ext in (".h", ".hpp", ".hxx"))
-def is_c_header(filename):
- ext = os.path.splitext(filename)[1]
- return (ext in (".h", ".hpp", ".hxx"))
-
-
def is_c(filename):
ext = os.path.splitext(filename)[1]
return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
@@ -79,6 +73,7 @@
def makefile_log():
import subprocess
+ import time
# Check blender is not 2.5x until it supports playback again
print("running make with --dry-run ...")
process = subprocess.Popen(["make", "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -765,7 +765,7 @@
fw(" .. attribute:: %s\n\n" % prop.identifier)
if prop.description:
fw(" %s\n\n" % prop.description)
-
+
# special exception, cant use genric code here for enums
if prop.type == "enum":
enum_text = pyrna_enum2sphinx(prop)
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2011-09-20 18:29:19 UTC (rev 40413)
@@ -67,6 +67,7 @@
FX/AUD_SuperposeFactory.cpp
FX/AUD_SuperposeReader.cpp
FX/AUD_VolumeFactory.cpp
+
intern/AUD_3DMath.h
intern/AUD_AnimateableProperty.cpp
intern/AUD_AnimateableProperty.h
@@ -99,6 +100,7 @@
intern/AUD_IWriter.h
intern/AUD_JOSResampleFactory.cpp
intern/AUD_JOSResampleFactory.h
+ intern/AUD_JOSResampleReaderCoeff.cpp
intern/AUD_JOSResampleReader.cpp
intern/AUD_JOSResampleReader.h
intern/AUD_LinearResampleFactory.cpp
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -25,6 +25,7 @@
# dont register these classes since they are only helpers.
from blf import gettext as _
+
class MotionPathButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -22,6 +22,7 @@
from rna_prop_ui import PropertyPanel
from blf import gettext as _
+
class ArmatureButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -23,6 +23,7 @@
from rna_prop_ui import PropertyPanel
from blf import gettext as _
+
class BoneButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -22,6 +22,7 @@
from rna_prop_ui import PropertyPanel
from blf import gettext as _
+
class CameraButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -22,6 +22,7 @@
from rna_prop_ui import PropertyPanel
from blf import gettext as _
+
class CurveButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -21,6 +21,7 @@
from bpy.types import Panel
from blf import gettext as _
+
class DataButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -22,6 +22,7 @@
from rna_prop_ui import PropertyPanel
from blf import gettext as _
+
class LAMP_MT_sunsky_presets(Menu):
bl_label = _("Sun & Sky Presets")
preset_subdir = "sunsky"
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -22,6 +22,7 @@
from rna_prop_ui import PropertyPanel
from blf import gettext as _
+
class MESH_MT_vertex_group_specials(Menu):
bl_label = _("Vertex Group Specials")
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -22,6 +22,7 @@
from rna_prop_ui import PropertyPanel
from blf import gettext as _
+
class DataButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-09-20 18:16:44 UTC (rev 40412)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-09-20 18:29:19 UTC (rev 40413)
@@ -21,6 +21,7 @@
from bpy.types import Panel
from blf import gettext as _
+
class ModifierButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list