Commit bed488a3 authored by Dawid Huczynski's avatar Dawid Huczynski
Browse files

Merge branch 'master' into '0.9.6'

# Conflicts:
#   SimpleAssetManager/__init__.py
parents 27c2f515 0455dceb
......@@ -24,6 +24,7 @@ bl_info = {
"category": "Add Mesh"
}
# TODO: ovverride masterlibrary with project library
# TODO: append same object instance not new one
# TODO: textures library
# TODO: row and columns in asset grid goes to preferences?
......@@ -568,7 +569,6 @@ def register():
bpy.types.SCENE_PT_scene.append(SAM_MT_Library_Path)
# Unregister
def unregister():
bpy.types.VIEW3D_MT_add.remove(SAM_MT_button)
bpy.types.SCENE_PT_scene.remove(SAM_MT_Library_Path)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment