kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

pep8 update & some minor cmake edits.

Browse Source
This commit is contained in:
Campbell Barton 2011-09-20 18:29:19 +00:00
parent 0af633a36c
commit 8f5112f191
29 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/buildbot/master_unpack.py
View File

@ -52,7 +52,7 @@ def get_platform(filename):
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():

1
build_files/cmake/cmake_static_check_cppcheck.py
View File

@ -43,6 +43,7 @@ CHECKER_ARGS = [
# "--enable=all", # if you want sixty hundred pedantic suggestions
]
def main():
source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)

7
build_files/cmake/project_source_info.py
View File

@ -27,7 +27,6 @@ __all__ = (
)
import os
import sys
from os.path import join, dirname, normpath, abspath
SOURCE_DIR = join(dirname(__file__), "..", "..")
@ -35,11 +34,6 @@ SOURCE_DIR = normpath(SOURCE_DIR)
SOURCE_DIR = abspath(SOURCE_DIR)
def is_c_header(filename):
ext = os.path.splitext(filename)[1]
return (ext in (".h", ".hpp", ".hxx"))
def is_c_header(filename):
ext = os.path.splitext(filename)[1]
return (ext in (".h", ".hpp", ".hxx"))
@ -79,6 +73,7 @@ def do_ignore(filepath, ignore_prefix_list):
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"],

2
intern/audaspace/CMakeLists.txt
View File

@ -67,6 +67,7 @@ set(SRC
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 @@ set(SRC
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

1
release/scripts/startup/bl_ui/properties_animviz.py
View File

@ -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'

1
release/scripts/startup/bl_ui/properties_data_armature.py
View File

@ -22,6 +22,7 @@ from bpy.types import Panel, Menu
from rna_prop_ui import PropertyPanel
from blf import gettext as _
class ArmatureButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

1
release/scripts/startup/bl_ui/properties_data_bone.py
View File

@ -23,6 +23,7 @@ from bpy.types import Panel
from rna_prop_ui import PropertyPanel
from blf import gettext as _
class BoneButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

1
release/scripts/startup/bl_ui/properties_data_camera.py
View File

@ -22,6 +22,7 @@ from bpy.types import Panel
from rna_prop_ui import PropertyPanel
from blf import gettext as _
class CameraButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

1
release/scripts/startup/bl_ui/properties_data_curve.py
View File

@ -22,6 +22,7 @@ from bpy.types import Panel
from rna_prop_ui import PropertyPanel
from blf import gettext as _
class CurveButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

1
release/scripts/startup/bl_ui/properties_data_empty.py
View File

@ -21,6 +21,7 @@ import bpy
from bpy.types import Panel
from blf import gettext as _
class DataButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

1
release/scripts/startup/bl_ui/properties_data_lamp.py
View File

@ -22,6 +22,7 @@ from bpy.types import Menu, Panel
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"

1
release/scripts/startup/bl_ui/properties_data_mesh.py
View File

@ -22,6 +22,7 @@ from bpy.types import Menu, Panel
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'}

1
release/scripts/startup/bl_ui/properties_data_metaball.py
View File

@ -22,6 +22,7 @@ from bpy.types import Panel
from rna_prop_ui import PropertyPanel
from blf import gettext as _
class DataButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

3
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@ -21,6 +21,7 @@ import bpy
from bpy.types import Panel
from blf import gettext as _
class ModifierButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
@ -203,7 +204,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
def DECIMATE(self, layout, ob, md):
layout.prop(md, "ratio")
layout.label(text=_("Face Count")+": %s" % str(md.face_count))
layout.label(text=_("Face Count") + ": %d" % md.face_count)
def DISPLACE(self, layout, ob, md):
split = layout.split()

1
release/scripts/startup/bl_ui/properties_game.py
View File

@ -21,6 +21,7 @@ import bpy
from bpy.types import Panel
from blf import gettext as _
class PhysicsButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

2
release/scripts/startup/bl_ui/properties_material.py
View File

@ -22,6 +22,7 @@ from bpy.types import Menu, Panel
from rna_prop_ui import PropertyPanel
from blf import gettext as _
def active_node_mat(mat):
# TODO, 2.4x has a pipeline section, for 2.5 we need to communicate
# which settings from node-materials are used
@ -636,6 +637,7 @@ class MATERIAL_PT_game_settings(MaterialButtonsPanel, bpy.types.Panel):
row.prop(game, "alpha_blend", text="")
row.prop(game, "face_orientation", text="")
class MATERIAL_PT_physics(MaterialButtonsPanel, bpy.types.Panel):
bl_label = "Physics"
COMPAT_ENGINES = {'BLENDER_GAME'}

1
release/scripts/startup/bl_ui/properties_object.py
View File

@ -22,6 +22,7 @@ from bpy.types import Panel
from rna_prop_ui import PropertyPanel
from blf import gettext as _
class ObjectButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

1
release/scripts/startup/bl_ui/properties_object_constraint.py
View File

@ -21,6 +21,7 @@ import bpy
from bpy.types import Panel
from blf import gettext as _
class ConstraintButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

1
release/scripts/startup/bl_ui/properties_physics_common.py
View File

@ -22,6 +22,7 @@ import bpy
from bpy.types import Panel
from blf import gettext as _
class PhysicButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

1
release/scripts/startup/bl_ui/properties_physics_fluid.py
View File

@ -21,6 +21,7 @@ import bpy
from bpy.types import Panel
from blf import gettext as _
class PhysicButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

1
release/scripts/startup/bl_ui/properties_scene.py
View File

@ -22,6 +22,7 @@ from bpy.types import Operator, Panel
from rna_prop_ui import PropertyPanel
from blf import gettext as _
class SceneButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'

2
source/blender/editors/space_logic/CMakeLists.txt
View File

@ -21,11 +21,11 @@
set(INC
../include
../interface
../../blenfont
../../blenkernel
../../blenlib
../../blenloader
../../editors/interface
../../makesdna
../../makesrna
../../windowmanager

1
source/tests/bl_load_py_modules.py
View File

@ -25,7 +25,6 @@ import addon_utils
import sys
import os
import imp
def source_list(path, filename_check=None):