[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24201] trunk/blender: tabs to spaces, remove trailing white space.
Campbell Barton
ideasman42 at gmail.com
Sat Oct 31 20:31:46 CET 2009
Revision: 24201
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24201
Author: campbellbarton
Date: 2009-10-31 20:31:45 +0100 (Sat, 31 Oct 2009)
Log Message:
-----------
tabs to spaces, remove trailing white space. (apart of pep8)
didnt do "release/scripts/io" since some exporters cant be auto converted
Modified Paths:
--------------
trunk/blender/release/datafiles/datatoc.py
trunk/blender/release/scripts/modules/bpy_ext/Object.py
trunk/blender/release/scripts/modules/bpy_ops.py
trunk/blender/release/scripts/modules/bpy_sys.py
trunk/blender/release/scripts/modules/dynamic_menu.py
trunk/blender/release/scripts/templates/gamelogic.py
trunk/blender/release/scripts/templates/gamelogic_basic.py
trunk/blender/release/scripts/templates/gamelogic_module.py
trunk/blender/release/scripts/templates/operator.py
trunk/blender/release/scripts/templates/operator_simple.py
trunk/blender/release/scripts/ui/buttons_data_armature.py
trunk/blender/release/scripts/ui/buttons_data_bone.py
trunk/blender/release/scripts/ui/buttons_data_camera.py
trunk/blender/release/scripts/ui/buttons_data_curve.py
trunk/blender/release/scripts/ui/buttons_data_empty.py
trunk/blender/release/scripts/ui/buttons_data_lamp.py
trunk/blender/release/scripts/ui/buttons_data_lattice.py
trunk/blender/release/scripts/ui/buttons_data_mesh.py
trunk/blender/release/scripts/ui/buttons_data_metaball.py
trunk/blender/release/scripts/ui/buttons_data_modifier.py
trunk/blender/release/scripts/ui/buttons_data_text.py
trunk/blender/release/scripts/ui/buttons_game.py
trunk/blender/release/scripts/ui/buttons_material.py
trunk/blender/release/scripts/ui/buttons_object.py
trunk/blender/release/scripts/ui/buttons_object_constraint.py
trunk/blender/release/scripts/ui/buttons_particle.py
trunk/blender/release/scripts/ui/buttons_physics_cloth.py
trunk/blender/release/scripts/ui/buttons_physics_common.py
trunk/blender/release/scripts/ui/buttons_physics_field.py
trunk/blender/release/scripts/ui/buttons_physics_fluid.py
trunk/blender/release/scripts/ui/buttons_physics_smoke.py
trunk/blender/release/scripts/ui/buttons_physics_softbody.py
trunk/blender/release/scripts/ui/buttons_render.py
trunk/blender/release/scripts/ui/buttons_scene.py
trunk/blender/release/scripts/ui/buttons_texture.py
trunk/blender/release/scripts/ui/buttons_world.py
trunk/blender/release/scripts/ui/space_buttons.py
trunk/blender/release/scripts/ui/space_filebrowser.py
trunk/blender/release/scripts/ui/space_image.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_logic.py
trunk/blender/release/scripts/ui/space_node.py
trunk/blender/release/scripts/ui/space_outliner.py
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/release/scripts/ui/space_text.py
trunk/blender/release/scripts/ui/space_time.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
trunk/blender/source/blender/python/epy_doc_gen.py
trunk/blender/source/blender/python/rna_dump.py
trunk/blender/source/blender/python/simple_enum_gen.py
trunk/blender/source/tools/MakeCursor.py
Modified: trunk/blender/release/datafiles/datatoc.py
===================================================================
--- trunk/blender/release/datafiles/datatoc.py 2009-10-31 18:48:58 UTC (rev 24200)
+++ trunk/blender/release/datafiles/datatoc.py 2009-10-31 19:31:45 UTC (rev 24201)
@@ -27,23 +27,23 @@
import sys, os
if len(sys.argv) < 2:
- sys.stdout.write("Usage: datatoc <data_file>\n")
- sys.exit(1)
+ sys.stdout.write("Usage: datatoc <data_file>\n")
+ sys.exit(1)
filename = sys.argv[1]
try:
- fpin = open(filename, "rb");
+ fpin = open(filename, "rb");
except:
- sys.stdout.write("Unable to open input %s\n" % sys.argv[1])
- sys.exit(1)
+ sys.stdout.write("Unable to open input %s\n" % sys.argv[1])
+ sys.exit(1)
fpin.seek(0, os.SEEK_END)
size = fpin.tell()
fpin.seek(0)
if filename[0] == ".":
- filename = filename[1:]
+ filename = filename[1:]
cname = filename + ".c"
sys.stdout.write("Making C file <%s>\n" % cname)
@@ -52,10 +52,10 @@
sys.stdout.write(str(size))
sys.stdout.write("\n")
try:
- fpout = open(cname, "w")
+ fpout = open(cname, "w")
except:
- sys.stdout.write("Unable to open output %s\n" % cname)
- sys.exit(1)
+ sys.stdout.write("Unable to open output %s\n" % cname)
+ sys.exit(1)
fpout.write("/* DataToC output of file <%s> */\n\n" % filename)
fpout.write("int datatoc_%s_size= %d;\n" % (filename, size))
@@ -63,12 +63,12 @@
fpout.write("char datatoc_%s[]= {\n" % filename)
while size > 0:
- size -= 1
- if size % 32 == 31:
- fpout.write("\n")
-
- fpout.write("%3d," % ord(fpin.read(1)))
+ size -= 1
+ if size % 32 == 31:
+ fpout.write("\n")
+ fpout.write("%3d," % ord(fpin.read(1)))
+
fpout.write("\n 0};\n\n")
fpin.close()
Modified: trunk/blender/release/scripts/modules/bpy_ext/Object.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_ext/Object.py 2009-10-31 18:48:58 UTC (rev 24200)
+++ trunk/blender/release/scripts/modules/bpy_ext/Object.py 2009-10-31 19:31:45 UTC (rev 24201)
@@ -1,4 +1,4 @@
import bpy
class_obj = bpy.types.Object
-class_obj.getChildren = lambda ob: [child for child in bpy.data.objects if child.parent == ob]
\ No newline at end of file
+class_obj.getChildren = lambda ob: [child for child in bpy.data.objects if child.parent == ob]
Modified: trunk/blender/release/scripts/modules/bpy_ops.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_ops.py 2009-10-31 18:48:58 UTC (rev 24200)
+++ trunk/blender/release/scripts/modules/bpy_ops.py 2009-10-31 19:31:45 UTC (rev 24201)
@@ -220,11 +220,11 @@
'''Set a context value.'''
bl_idname = "wm.context_set_boolean"
bl_label = "Context Set"
-
+
path = rna_path_prop
value = BoolProperty(name="Value",
description="Assignment value", default=True)
-
+
execute = execute_context_assign
@@ -232,10 +232,10 @@
'''Set a context value.'''
bl_idname = "wm.context_set_int"
bl_label = "Context Set"
-
+
path = rna_path_prop
value = IntProperty(name="Value", description="Assign value", default=0)
-
+
execute = execute_context_assign
@@ -255,7 +255,7 @@
'''Set a context value.'''
bl_idname = "wm.context_set_string"
bl_label = "Context Set"
-
+
path = rna_path_prop
value = StringProperty(name="Value",
description="Assign value", maxlen=1024, default="")
Modified: trunk/blender/release/scripts/modules/bpy_sys.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_sys.py 2009-10-31 18:48:58 UTC (rev 24200)
+++ trunk/blender/release/scripts/modules/bpy_sys.py 2009-10-31 19:31:45 UTC (rev 24201)
@@ -2,11 +2,11 @@
import os
def expandpath(path):
- if path.startswith("//"):
- return os.path.join(os.path.dirname(bpy.data.filename), path[2:])
-
- return path
+ if path.startswith("//"):
+ return os.path.join(os.path.dirname(bpy.data.filename), path[2:])
+ return path
+
import types
bpy.sys = types.ModuleType("bpy.sys")
bpy.sys.expandpath = expandpath
Modified: trunk/blender/release/scripts/modules/dynamic_menu.py
===================================================================
--- trunk/blender/release/scripts/modules/dynamic_menu.py 2009-10-31 18:48:58 UTC (rev 24200)
+++ trunk/blender/release/scripts/modules/dynamic_menu.py 2009-10-31 19:31:45 UTC (rev 24201)
@@ -1,87 +1,87 @@
import bpy
def collect_baseclasses(_class, bases):
-
- if _class is type or _class is object:
- return bases
-
- bases.append(_class)
- for _superclass in _class.__bases__:
- collect_baseclasses(_superclass, bases)
-
- return bases
+ if _class is type or _class is object:
+ return bases
+
+ bases.append(_class)
+ for _superclass in _class.__bases__:
+ collect_baseclasses(_superclass, bases)
+
+ return bases
+
def collect_subclasses(_class, subs):
-
- if _class is type or _class is object:
- return subs
-
- subs.append(_class)
- for _subclass in _class.__subclasses__():
- collect_subclasses(_subclass, subs)
-
- return subs
+ if _class is type or _class is object:
+ return subs
+
+ subs.append(_class)
+ for _subclass in _class.__subclasses__():
+ collect_subclasses(_subclass, subs)
+
+ return subs
+
class DynMenu(bpy.types.Menu):
-
- def draw(self, context):
- '''
- This is a draw function that is used to call all subclasses draw functions
- starting from the registered classes draw function and working down.
-
- DynMenu.setup() must be called first.
-
- Sort/group classes could be nice
- '''
-
- subclass_ls = []
- collect_subclasses(self.__class__, subclass_ls)
- # print(subclass_ls)
-
- for subclass in subclass_ls:
- # print("drawwing", subclass) # , dir(subclass))
- subclass.internal_draw(self, context)
- # print("subclass.internal_draw", subclass.internal_draw)
+ def draw(self, context):
+ '''
+ This is a draw function that is used to call all subclasses draw functions
+ starting from the registered classes draw function and working down.
+
+ DynMenu.setup() must be called first.
+
+ Sort/group classes could be nice
+ '''
+
+ subclass_ls = []
+ collect_subclasses(self.__class__, subclass_ls)
+ # print(subclass_ls)
+
+ for subclass in subclass_ls:
+ # print("drawwing", subclass) # , dir(subclass))
+ subclass.internal_draw(self, context)
+ # print("subclass.internal_draw", subclass.internal_draw)
+
def setup(menu_class):
- '''
- Setup subclasses (not needed when self.add() is used)
- '''
- bases = collect_baseclasses(menu_class, [])
-
- # Incase 'DynMenu' isnt last
- while bases[-1] is not DynMenu:
- bases.pop()
- bases.pop() # remove 'DynMenu'
-
- root_class = bases[-1] # this is the registered class
-
- for subclass in collect_subclasses(root_class, []):
- #print(subclass)
-
- draw = getattr(subclass, 'draw', None)
- if draw and not hasattr(subclass, 'internal_draw'):
- # print("replace", subclass, draw)
- try:
- del subclass.draw
- except:
- pass
- subclass.internal_draw = draw
-
- root_class.draw = DynMenu.draw
+ '''
+ Setup subclasses (not needed when self.add() is used)
+ '''
+ bases = collect_baseclasses(menu_class, [])
+ # Incase 'DynMenu' isnt last
+ while bases[-1] is not DynMenu:
+ bases.pop()
+ bases.pop() # remove 'DynMenu'
+
+ root_class = bases[-1] # this is the registered class
+
+ for subclass in collect_subclasses(root_class, []):
+ #print(subclass)
+
+ draw = getattr(subclass, 'draw', None)
+ if draw and not hasattr(subclass, 'internal_draw'):
+ # print("replace", subclass, draw)
+ try:
+ del subclass.draw
+ except:
+ pass
+ subclass.internal_draw = draw
+
+ root_class.draw = DynMenu.draw
+
def add(menu_class, func):
- '''
- Add a single function directly without having to make a class
-
- important that the returned value should be stored in the module that called it.
- '''
-
- newclass = type('<menuclass>', (menu_class,), {})
- newclass.internal_draw = func
- setup(menu_class)
- return newclass
+ '''
+ Add a single function directly without having to make a class
+ important that the returned value should be stored in the module that called it.
+ '''
+
+ newclass = type('<menuclass>', (menu_class,), {})
+ newclass.internal_draw = func
+ setup(menu_class)
+ return newclass
+
'''
# so we dont need to import this module
DynMenu.setup = setup
Modified: trunk/blender/release/scripts/templates/gamelogic.py
===================================================================
--- trunk/blender/release/scripts/templates/gamelogic.py 2009-10-31 18:48:58 UTC (rev 24200)
+++ trunk/blender/release/scripts/templates/gamelogic.py 2009-10-31 19:31:45 UTC (rev 24201)
@@ -4,75 +4,75 @@
# GameLogic has been added to the global namespace no need to import
# for keyboard event comparison
-# import GameKeys
+# import GameKeys
# support for Vector(), Matrix() types and advanced functions like AngleBetweenVecs(v1,v2) and RotationMatrix(...)
-# import Mathutils
+# import Mathutils
# for functions like getWindowWidth(), getWindowHeight()
# import Rasterizer
def main():
- cont = GameLogic.getCurrentController()
-
- # The KX_GameObject that owns this controller.
- own = cont.owner
-
- # for scripts that deal with spacial logic
- own_pos = own.worldPosition
-
-
- # Some example functions, remove to write your own script.
- # check for a positive sensor, will run on any object without errors.
- print 'Logic info for KX_GameObject', own.name
- input = False
-
- for sens in cont.sensors:
- # The sensor can be on another object, we may want to use it
- own_sens = sens.owner
- print ' sensor:', sens.name,
- if sens.positive:
- print '(true)'
- input = True
- else:
- print '(false)'
-
- for actu in cont.actuators:
- # The actuator can be on another object, we may want to use it
- own_actu = actu.owner
- print ' actuator:', actu.name
-
- # This runs the actuator or turns it off
- # note that actuators will continue to run unless explicitly turned off.
- if input:
- cont.activate(actu)
- else:
- cont.deactivate(actu)
-
- # Its also good practice to get sensors and actuators by name
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list