Merged changes in the trunk up to revision 40520.

2011-09-24 21:39:11 +00:00
parent 9c42afb1c0 1ddb64817d
commit c0c488d0b2
192 changed files with 5106 additions and 5052 deletions
--- a/release/scripts/startup/bl_operators/init.py
+++ b/release/scripts/startup/bl_operators/init.py
@@ -24,11 +24,11 @@ if "bpy" in locals():
        _reload(val)
 _modules = (
    "add_mesh_torus",
-    "animsys_update",
+    "anim",
+    "console",
    "freestyle",
    "image",
    "mesh",
-    "nla",
    "object_align",
    "object",
    "object_randomize_transform",
@@ -40,6 +40,7 @@ _modules = (
    "uvcalc_lightmap",
    "uvcalc_smart_project",
    "vertexpaint_dirt",
+    "view3d",
    "wm",
 )
 __import__(name=__name__, fromlist=_modules)