[Bf-blender-cvs] [304cdfa] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 304cdfa476652ee664ebdfa0c32c3f715e9c25c6
Author: Bastien Montagne
Date:   Fri Mar 4 14:35:05 2016 +0100
Branches: asset-engine
https://developer.blender.org/rB304cdfa476652ee664ebdfa0c32c3f715e9c25c6

Merge branch 'master' into asset-engine

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_operators/__init__.py
index c391636,a696410..06010f6
--- a/release/scripts/startup/bl_operators/__init__.py
+++ b/release/scripts/startup/bl_operators/__init__.py
@@@ -47,10 -49,8 +49,10 @@@ _modules = 
      "vertexpaint_dirt",
      "view3d",
      "wm",
- ]
+     ]
  
 +_modules.append("amber")
 +
  import bpy
  
  if bpy.app.build_options.freestyle: