diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-18 04:48:59 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-18 04:48:59 +0400 |
| commit | c1ceab1281ccf061f03f8000bf190a082a5385d8 (patch) | |
| tree | 01b9a9cfca80432d316bdad6c18c74eb025e9eb0 /release/scripts/startup/bl_ui/__init__.py | |
| parent | 0d9c98c4bbfbc8c70c4772086dd09a51d01921ef (diff) | |
| parent | 66a35e089a64d27bfc09c2225a530069eca05875 (diff) | |
Merged changes in the trunk up to revision 55357.
Resolved conflicts:
release/datafiles/startup.blend
source/blender/editors/space_nla/nla_buttons.c
Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of
recent changes for the use of bool.
Diffstat (limited to 'release/scripts/startup/bl_ui/__init__.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py index 6ee583d0894..6bda65dba06 100644 --- a/release/scripts/startup/bl_ui/__init__.py +++ b/release/scripts/startup/bl_ui/__init__.py @@ -26,6 +26,7 @@ if "bpy" in locals(): _reload(val) _modules = ( "properties_animviz", + "properties_constraint", "properties_data_armature", "properties_data_bone", "properties_data_camera", @@ -40,7 +41,6 @@ _modules = ( "properties_game", "properties_mask_common", "properties_material", - "properties_object_constraint", "properties_object", "properties_particle", "properties_physics_cloth", |