diff options
Diffstat (limited to 'doc/python_api')
| -rw-r--r-- | doc/python_api/examples/bpy.types.UIList.1.py | 9 | ||||
| -rw-r--r-- | doc/python_api/examples/bpy.types.UIList.2.py | 4 | ||||
| -rw-r--r-- | doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst | 10 | ||||
| -rw-r--r-- | doc/python_api/rst/include__bmesh.rst | 1 | ||||
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 6 | ||||
| -rwxr-xr-x | doc/python_api/sphinx_doc_gen.sh | 10 |
6 files changed, 26 insertions, 14 deletions
diff --git a/doc/python_api/examples/bpy.types.UIList.1.py b/doc/python_api/examples/bpy.types.UIList.1.py index 88f6b0999cd..92b115b2af4 100644 --- a/doc/python_api/examples/bpy.types.UIList.1.py +++ b/doc/python_api/examples/bpy.types.UIList.1.py @@ -32,11 +32,14 @@ class MATERIAL_UL_matslots_example(bpy.types.UIList): ma = slot.material # draw_item must handle the three layout types... Usually 'DEFAULT' and 'COMPACT' can share the same code. if self.layout_type in {'DEFAULT', 'COMPACT'}: - # You should always start your row layout by a label (icon + text), this will also make the row easily - # selectable in the list! + # You should always start your row layout by a label (icon + text), or a non-embossed text field, + # this will also make the row easily selectable in the list! The later also enables ctrl-click rename. # We use icon_value of label, as our given icon is an integer value, not an enum ID. # Note "data" names should never be translated! - layout.label(text=ma.name if ma else "", translate=False, icon_value=icon) + if ma: + layout.prop(ma, "name", text="", emboss=False, icon_value=icon) + else: + layout.label(text="", translate=False, icon_value=icon) # And now we can add other UI stuff... # Here, we add nodes info if this material uses (old!) shading nodes. if ma and not context.scene.render.use_shading_nodes: diff --git a/doc/python_api/examples/bpy.types.UIList.2.py b/doc/python_api/examples/bpy.types.UIList.2.py index 4e30e6895d6..feed263b2e7 100644 --- a/doc/python_api/examples/bpy.types.UIList.2.py +++ b/doc/python_api/examples/bpy.types.UIList.2.py @@ -49,9 +49,9 @@ class MESH_UL_vgroups_slow(bpy.types.UIList): col = layout.column() col.enabled = False col.alignment = 'LEFT' - col.label(text=vgroup.name, translate=False, icon_value=icon) + col.prop(vgroup, "name", text="", emboss=False, icon_value=icon) else: - layout.label(text=vgroup.name, translate=False, icon_value=icon) + layout.prop(vgroup, "name", text="", emboss=False, icon_value=icon) icon = 'LOCKED' if vgroup.lock_weight else 'UNLOCKED' layout.prop(vgroup, "lock_weight", text="", icon=icon, emboss=False) elif self.layout_type in {'GRID'}: diff --git a/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst b/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst index 5d699637eb7..af4852d6ab1 100644 --- a/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst +++ b/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst @@ -151,11 +151,17 @@ base class --- :class:`SCA_IObject` visibility flag. :type: boolean - + .. note:: - + Game logic will still run for invisible objects. + .. attribute:: record_animation + + Record animation for this object. + + :type: boolean + .. attribute:: color The object color of the object. [r, g, b, a] diff --git a/doc/python_api/rst/include__bmesh.rst b/doc/python_api/rst/include__bmesh.rst index ce7c09ad3a1..9dccd4e72ae 100644 --- a/doc/python_api/rst/include__bmesh.rst +++ b/doc/python_api/rst/include__bmesh.rst @@ -9,6 +9,7 @@ Submodules: * :mod:`bmesh.ops` * :mod:`bmesh.types` * :mod:`bmesh.utils` +* :mod:`bmesh.geometry` Intro diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index e95fa6fef35..a8128633569 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -256,6 +256,7 @@ else: "bmesh.ops", "bmesh.types", "bmesh.utils", + "bmesh.geometry", "bpy.app", "bpy.app.handlers", "bpy.app.translations", @@ -384,12 +385,12 @@ MODULE_GROUPING = { blender_version_strings = [str(v) for v in bpy.app.version] # converting bytes to strings, due to #30154 -BLENDER_REVISION = str(bpy.app.build_revision, 'utf_8') +BLENDER_REVISION = str(bpy.app.build_hash, 'utf_8') BLENDER_DATE = str(bpy.app.build_date, 'utf_8') BLENDER_VERSION_DOTS = ".".join(blender_version_strings) # '2.62.1' if BLENDER_REVISION != "Unknown": - BLENDER_VERSION_DOTS += " r" + BLENDER_REVISION # '2.62.1 r44584' + BLENDER_VERSION_DOTS += " " + BLENDER_REVISION # '2.62.1 SHA1' BLENDER_VERSION_PATH = "_".join(blender_version_strings) # '2_62_1' if bpy.app.version_cycle == "release": @@ -1768,6 +1769,7 @@ def write_rst_importable_modules(basepath): "bmesh" : "BMesh Module", "bmesh.types" : "BMesh Types", "bmesh.utils" : "BMesh Utilities", + "bmesh.geometry" : "BMesh Geometry Utilities", "bpy.app" : "Application Data", "bpy.app.handlers" : "Application Handlers", "bpy.app.translations" : "Application Translations", diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh index 9e069cb0540..5b9af77a58c 100755 --- a/doc/python_api/sphinx_doc_gen.sh +++ b/doc/python_api/sphinx_doc_gen.sh @@ -17,7 +17,7 @@ DO_OUT_PDF=false BLENDER="./blender.bin" SSH_USER="ideasman42" -SSH_HOST=$SSH_USER"@emo.blender.org" +SSH_HOST=$SSH_USER"@blender.org" SSH_UPLOAD="/data/www/vhosts/www.blender.org/documentation" # blender_python_api_VERSION, added after # ---------------------------------------------------------------------------- @@ -99,18 +99,18 @@ fi if $DO_UPLOAD ; then cp $SPHINXBASE/sphinx-out/contents.html $SPHINXBASE/sphinx-out/index.html - ssh $SSH_USER@emo.blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*' + ssh $SSH_USER@blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*' rsync --progress -avze "ssh -p 22" $SPHINXBASE/sphinx-out/* $SSH_HOST:$SSH_UPLOAD_FULL/ ## symlink the dir to a static URL - #ssh $SSH_USER@emo.blender.org 'rm '$SSH_UPLOAD'/250PythonDoc && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/250PythonDoc' + #ssh $SSH_USER@blender.org 'rm '$SSH_UPLOAD'/250PythonDoc && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/250PythonDoc' # better redirect - ssh $SSH_USER@emo.blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/250PythonDoc/index.html' + ssh $SSH_USER@blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/250PythonDoc/index.html' # redirect for release only so wiki can point here if [ "$blender_version_cycle" == "release" ] ; then - ssh $SSH_USER@emo.blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/blender_python_api/index.html' + ssh $SSH_USER@blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/blender_python_api/index.html' fi if $DO_OUT_PDF ; then |