[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35667] trunk/blender/release/scripts: move script directories for internal blender scripts.
Campbell Barton
ideasman42 at gmail.com
Mon Mar 21 13:35:50 CET 2011
Revision: 35667
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35667
Author: campbellbarton
Date: 2011-03-21 12:35:49 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
move script directories for internal blender scripts.
ui/ --> startup/bl_ui
op/ --> startup/bl_operators
scripts/startup/ is now the only auto-loading script dir which gives some speedup for blender loading too.
~/.blender/2.56/scripts/startup works for auto-loading scripts too.
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy/__init__.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
trunk/blender/release/scripts/startup/bl_operators/animsys_update.py
trunk/blender/release/scripts/startup/bl_operators/fcurve_euler_filter.py
trunk/blender/release/scripts/startup/bl_operators/image.py
trunk/blender/release/scripts/startup/bl_operators/mesh.py
trunk/blender/release/scripts/startup/bl_operators/nla.py
trunk/blender/release/scripts/startup/bl_operators/object.py
trunk/blender/release/scripts/startup/bl_operators/object_align.py
trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
trunk/blender/release/scripts/startup/bl_operators/presets.py
trunk/blender/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
trunk/blender/release/scripts/startup/bl_operators/sequencer.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
trunk/blender/release/scripts/startup/bl_operators/wm.py
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_lattice.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_particle.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_softbody.py
trunk/blender/release/scripts/startup/bl_ui/properties_render.py
trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
trunk/blender/release/scripts/startup/bl_ui/properties_world.py
trunk/blender/release/scripts/startup/bl_ui/space_console.py
trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
trunk/blender/release/scripts/startup/bl_ui/space_filebrowser.py
trunk/blender/release/scripts/startup/bl_ui/space_graph.py
trunk/blender/release/scripts/startup/bl_ui/space_image.py
trunk/blender/release/scripts/startup/bl_ui/space_info.py
trunk/blender/release/scripts/startup/bl_ui/space_logic.py
trunk/blender/release/scripts/startup/bl_ui/space_nla.py
trunk/blender/release/scripts/startup/bl_ui/space_node.py
trunk/blender/release/scripts/startup/bl_ui/space_outliner.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_time.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
Added Paths:
-----------
trunk/blender/release/scripts/modules/console_python.py
trunk/blender/release/scripts/modules/console_shell.py
trunk/blender/release/scripts/startup/
trunk/blender/release/scripts/startup/bl_operators/
trunk/blender/release/scripts/startup/bl_ui/
trunk/blender/release/scripts/startup/bl_ui/__init__.py
trunk/blender/release/scripts/startup/keyingsets_builtins.py
Removed Paths:
-------------
trunk/blender/release/scripts/keyingsets/keyingsets_builtins.py
trunk/blender/release/scripts/op/
trunk/blender/release/scripts/startup/bl_operators/console_python.py
trunk/blender/release/scripts/startup/bl_operators/console_shell.py
trunk/blender/release/scripts/ui/
Deleted: trunk/blender/release/scripts/keyingsets/keyingsets_builtins.py
===================================================================
--- trunk/blender/release/scripts/keyingsets/keyingsets_builtins.py 2011-03-21 10:53:29 UTC (rev 35666)
+++ trunk/blender/release/scripts/keyingsets/keyingsets_builtins.py 2011-03-21 12:35:49 UTC (rev 35667)
@@ -1,365 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-"""
-Built-In Keying Sets
-None of these Keying Sets should be removed, as these
-are needed by various parts of Blender in order for them
-to work correctly.
-"""
-
-import bpy
-import keyingsets_utils
-
-###############################
-# Built-In KeyingSets
-
-
-# Location
-class BUILTIN_KSI_Location(bpy.types.KeyingSetInfo):
- bl_label = "Location"
-
- # poll - use predefined callback for selected bones/objects
- poll = keyingsets_utils.RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = keyingsets_utils.RKS_ITER_selected_item
-
- # generator - use callback for location
- generate = keyingsets_utils.RKS_GEN_location
-
-
-# Rotation
-class BUILTIN_KSI_Rotation(bpy.types.KeyingSetInfo):
- bl_label = "Rotation"
-
- # poll - use predefined callback for selected bones/objects
- poll = keyingsets_utils.RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = keyingsets_utils.RKS_ITER_selected_item
-
- # generator - use callback for location
- generate = keyingsets_utils.RKS_GEN_rotation
-
-
-# Scale
-class BUILTIN_KSI_Scaling(bpy.types.KeyingSetInfo):
- bl_label = "Scaling"
-
- # poll - use predefined callback for selected bones/objects
- poll = keyingsets_utils.RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = keyingsets_utils.RKS_ITER_selected_item
-
- # generator - use callback for location
- generate = keyingsets_utils.RKS_GEN_scaling
-
-# ------------
-
-
-# LocRot
-class BUILTIN_KSI_LocRot(bpy.types.KeyingSetInfo):
- bl_label = "LocRot"
-
- # poll - use predefined callback for selected bones/objects
- poll = keyingsets_utils.RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = keyingsets_utils.RKS_ITER_selected_item
-
- # generator
- def generate(self, context, ks, data):
- # location
- keyingsets_utils.RKS_GEN_location(self, context, ks, data)
- # rotation
- keyingsets_utils.RKS_GEN_rotation(self, context, ks, data)
-
-
-# LocScale
-class BUILTIN_KSI_LocScale(bpy.types.KeyingSetInfo):
- bl_label = "LocScale"
-
- # poll - use predefined callback for selected bones/objects
- poll = keyingsets_utils.RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = keyingsets_utils.RKS_ITER_selected_item
-
- # generator
- def generate(self, context, ks, data):
- # location
- keyingsets_utils.RKS_GEN_location(self, context, ks, data)
- # scale
- keyingsets_utils.RKS_GEN_scaling(self, context, ks, data)
-
-
-# LocRotScale
-class BUILTIN_KSI_LocRotScale(bpy.types.KeyingSetInfo):
- bl_label = "LocRotScale"
-
- # poll - use predefined callback for selected bones/objects
- poll = keyingsets_utils.RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = keyingsets_utils.RKS_ITER_selected_item
-
- # generator
- def generate(self, context, ks, data):
- # location
- keyingsets_utils.RKS_GEN_location(self, context, ks, data)
- # rotation
- keyingsets_utils.RKS_GEN_rotation(self, context, ks, data)
- # scale
- keyingsets_utils.RKS_GEN_scaling(self, context, ks, data)
-
-
-# RotScale
-class BUILTIN_KSI_RotScale(bpy.types.KeyingSetInfo):
- bl_label = "RotScale"
-
- # poll - use predefined callback for selected bones/objects
- poll = keyingsets_utils.RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = keyingsets_utils.RKS_ITER_selected_item
-
- # generator
- def generate(self, context, ks, data):
- # rotation
- keyingsets_utils.RKS_GEN_rotation(self, context, ks, data)
- # scaling
- keyingsets_utils.RKS_GEN_scaling(self, context, ks, data)
-
-# ------------
-
-
-# Location
-class BUILTIN_KSI_VisualLoc(bpy.types.KeyingSetInfo):
- bl_label = "Visual Location"
-
- bl_options = {'INSERTKEY_VISUAL'}
-
- # poll - use predefined callback for selected bones/objects
- poll = keyingsets_utils.RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = keyingsets_utils.RKS_ITER_selected_item
-
- # generator - use callback for location
- generate = keyingsets_utils.RKS_GEN_location
-
-
-# Rotation
-class BUILTIN_KSI_VisualRot(bpy.types.KeyingSetInfo):
- bl_label = "Visual Rotation"
-
- bl_options = {'INSERTKEY_VISUAL'}
-
- # poll - use predefined callback for selected bones/objects
- poll = keyingsets_utils.RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = keyingsets_utils.RKS_ITER_selected_item
-
- # generator - use callback for rotation
- generate = keyingsets_utils.RKS_GEN_rotation
-
-
-# VisualLocRot
-class BUILTIN_KSI_VisualLocRot(bpy.types.KeyingSetInfo):
- bl_label = "Visual LocRot"
-
- bl_options = {'INSERTKEY_VISUAL'}
-
- # poll - use predefined callback for selected bones/objects
- poll = keyingsets_utils.RKS_POLL_selected_items
-
- # iterator - use callback for selected bones/objects
- iterator = keyingsets_utils.RKS_ITER_selected_item
-
- # generator
- def generate(self, context, ks, data):
- # location
- keyingsets_utils.RKS_GEN_location(self, context, ks, data)
- # rotation
- keyingsets_utils.RKS_GEN_rotation(self, context, ks, data)
-
-# ------------
-
-
-# Available
-class BUILTIN_KSI_Available(bpy.types.KeyingSetInfo):
- bl_label = "Available"
-
- # poll - use predefined callback for selected objects
- # TODO: this should really check whether the selected object (or datablock)
- # has any animation data defined yet
- poll = keyingsets_utils.RKS_POLL_selected_objects
-
- # iterator - use callback for selected bones/objects
- iterator = keyingsets_utils.RKS_ITER_selected_item
-
- # generator - use callback for doing this
- generate = keyingsets_utils.RKS_GEN_available
-
-###############################
-
-
-# All properties that are likely to get animated in a character rig
-class BUILTIN_KSI_WholeCharacter(bpy.types.KeyingSetInfo):
- bl_label = "Whole Character"
-
- # these prefixes should be avoided, as they are not really bones
- # that animators should be touching (or need to touch)
- badBonePrefixes = (
- 'DEF',
- 'GEO',
- 'MCH',
- 'ORG',
- 'COR',
- 'VIS',
- # ... more can be added here as you need in your own rigs ...
- )
-
- # poll - pose-mode on active object only
- def poll(ksi, context):
- return ((context.active_object) and (context.active_object.pose) and
- (context.active_object.mode == 'POSE'))
-
- # iterator - all bones regardless of selection
- def iterator(ksi, context, ks):
- for bone in context.active_object.pose.bones:
- if not bone.name.startswith(BUILTIN_KSI_WholeCharacter.badBonePrefixes):
- ksi.generate(context, ks, bone)
-
- # generator - all unlocked bone transforms + custom properties
- def generate(ksi, context, ks, bone):
- # loc, rot, scale - only include unlocked ones
- ksi.doLoc(ks, bone)
-
- if bone.rotation_mode in ('QUATERNION', 'AXIS_ANGLE'):
- ksi.doRot4d(ks, bone)
- else:
- ksi.doRot3d(ks, bone)
- ksi.doScale(ks, bone)
-
- # custom props?
- ksi.doCustomProps(ks, bone)
-
- # ----------------
-
- # helper to add some bone's property to the Keying Set
- def addProp(ksi, ks, bone, prop, index=-1, use_groups=True):
- # add the property name to the base path
- id_path = bone.path_from_id()
- id_block = bone.id_data
-
- if prop.startswith('['):
- # custom properties
- path = id_path + prop
- else:
- # standard transforms/properties
- path = keyingsets_utils.path_add_property(id_path, prop)
-
- # add Keying Set entry for this...
- if use_groups:
- ks.paths.add(id_block, path, index, group_method='NAMED', group_name=bone.name)
- else:
- ks.paths.add(id_block, path, index)
-
- # ----------------
-
- # location properties
- def doLoc(ksi, ks, bone):
- if bone.lock_location == (False, False, False):
- ksi.addProp(ks, bone, "location")
- else:
- for i in range(3):
- if not bone.lock_location[i]:
- ksi.addProp(ks, bone, "location", i)
-
- # rotation properties
- def doRot4d(ksi, ks, bone):
- # rotation mode affects the property used
- if bone.rotation_mode == 'QUATERNION':
- prop = "rotation_quaternion"
- elif bone.rotation_mode == 'AXIS_ANGLE':
- prop = "rotation_axis_angle"
-
- # add rotation properties if they will
- if bone.lock_rotations_4d:
- # can check individually
- if (bone.lock_rotation == (False, False, False)) and (bone.lock_rotation_w == False):
- ksi.addProp(ks, bone, prop)
- else:
- if bone.lock_rotation_w == False:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list