diff options
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/blender_file_format/BlendFileDnaExporter_25.py | 6 | ||||
| -rw-r--r-- | doc/python_api/rst/info_tutorial_addon.rst | 20 | ||||
| -rwxr-xr-x | doc/python_api/sphinx_doc_gen.sh | 8 |
3 files changed, 22 insertions, 12 deletions
diff --git a/doc/blender_file_format/BlendFileDnaExporter_25.py b/doc/blender_file_format/BlendFileDnaExporter_25.py index 837b67c6eed..64c92c7cf80 100755 --- a/doc/blender_file_format/BlendFileDnaExporter_25.py +++ b/doc/blender_file_format/BlendFileDnaExporter_25.py @@ -112,7 +112,7 @@ class DNACatalogHTML: # ${version} and ${revision} if bpy: version = '.'.join(map(str, bpy.app.version)) - revision = bpy.app.build_revision[:-1] + revision = bpy.app.build_hash else: version = str(header.Version) revision = 'Unknown' @@ -404,7 +404,7 @@ def main(): # Files if '--dna-versioned' in sys.argv: blender_version = '_'.join(map(str, bpy.app.version)) - filename = 'dna-{0}-{1}_endian-{2}-r{3}'.format(sys.arch, sys.byteorder, blender_version, bpy.app.build_revision[2:-1]) + filename = 'dna-{0}-{1}_endian-{2}-{3}'.format(sys.arch, sys.byteorder, blender_version, bpy.app.build_hash) else: filename = 'dna' dir = os.path.dirname(__file__) @@ -451,7 +451,7 @@ def main(): os.remove(Path_Blend) # export dna to xhtml - log.info("6: export sdna to xhtml file") + log.info("6: export sdna to xhtml file: %r" % Path_HTML) handleHTML = open(Path_HTML, "w") catalog.WriteToHTML(handleHTML) handleHTML.close() diff --git a/doc/python_api/rst/info_tutorial_addon.rst b/doc/python_api/rst/info_tutorial_addon.rst index 5637cf2f638..436f74bc441 100644 --- a/doc/python_api/rst/info_tutorial_addon.rst +++ b/doc/python_api/rst/info_tutorial_addon.rst @@ -563,20 +563,26 @@ Bringing it all together # handle the keymap wm = bpy.context.window_manager - km = wm.keyconfigs.addon.keymaps.new(name='Object Mode', space_type='EMPTY') - kmi = km.keymap_items.new(ObjectCursorArray.bl_idname, 'SPACE', 'PRESS', ctrl=True, shift=True) - kmi.properties.total = 4 - addon_keymaps.append((km, kmi)) + # Note that in background mode (no GUI available), keyconfigs are not available either, so we have to check this + # to avoid nasty errors in background case. + kc = wm.keyconfigs.addon + if kc: + km = wm.keyconfigs.addon.keymaps.new(name='Object Mode', space_type='EMPTY') + kmi = km.keymap_items.new(ObjectCursorArray.bl_idname, 'SPACE', 'PRESS', ctrl=True, shift=True) + kmi.properties.total = 4 + addon_keymaps.append((km, kmi)) def unregister(): - bpy.utils.unregister_class(ObjectCursorArray) - bpy.types.VIEW3D_MT_object.remove(menu_func) - + # Note: when unregistering, it's usually good practice to do it in reverse order you registered. + # Can avoid strange issues like keymap still referring to operators already unregistered... # handle the keymap for km, kmi in addon_keymaps: km.keymap_items.remove(kmi) addon_keymaps.clear() + bpy.utils.unregister_class(ObjectCursorArray) + bpy.types.VIEW3D_MT_object.remove(menu_func) + if __name__ == "__main__": register() diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh index d7fc372a8d8..01de3e2c2ea 100755 --- a/doc/python_api/sphinx_doc_gen.sh +++ b/doc/python_api/sphinx_doc_gen.sh @@ -3,6 +3,10 @@ # bash doc/python_api/sphinx_doc_gen.sh # ssh upload means you need an account on the server +if [ "$1" == "" ] ; then + echo "Expected a single argument for the username on blender.org, aborting" + exit 1 +fi # ---------------------------------------------------------------------------- # Upload vars @@ -16,9 +20,9 @@ DO_OUT_PDF=false BLENDER="./blender.bin" -SSH_USER="ideasman42" +SSH_USER=$1 SSH_HOST=$SSH_USER"@blender.org" -SSH_UPLOAD="/data/www/vhosts/www.blender.org/documentation" # blender_python_api_VERSION, added after +SSH_UPLOAD="/data/www/vhosts/www.blender.org/api" # blender_python_api_VERSION, added after # ---------------------------------------------------------------------------- # Blender Version & Info |