diff --git a/.github/workflows/fake-bpy-module-ci.yml b/.github/workflows/fake-bpy-module-ci.yml index 20838138..a4a6d982 100644 --- a/.github/workflows/fake-bpy-module-ci.yml +++ b/.github/workflows/fake-bpy-module-ci.yml @@ -50,7 +50,7 @@ jobs: fail-fast: false matrix: blender_version: - ["2.78", "2.79", "2.80", "2.81", "2.82", "2.83", "2.90", "2.91"] + ["2.78", "2.79", "2.80", "2.81", "2.82", "2.83", "2.90", "2.91", "2.92"] steps: - name: Checkout repo uses: actions/checkout@v2 @@ -126,7 +126,7 @@ jobs: fail-fast: false matrix: blender_version: - ["2.78", "2.79", "2.80", "2.81", "2.82", "2.83", "2.90", "2.91"] + ["2.78", "2.79", "2.80", "2.81", "2.82", "2.83", "2.90", "2.91", "2.92"] steps: - name: Fetch artifacts uses: actions/download-artifact@v2 @@ -150,7 +150,7 @@ jobs: fail-fast: false matrix: blender_version: - ["2.78", "2.79", "2.80", "2.81", "2.82", "2.83", "2.90", "2.91"] + ["2.78", "2.79", "2.80", "2.81", "2.82", "2.83", "2.90", "2.91", "2.92"] steps: - name: Fetch Artifacts uses: actions/download-artifact@v2 @@ -172,7 +172,7 @@ jobs: fail-fast: false matrix: blender_version: - ["2.78", "2.79", "2.80", "2.81", "2.82", "2.83", "2.90", "2.91"] + ["2.78", "2.79", "2.80", "2.81", "2.82", "2.83", "2.90", "2.91", "2.92"] steps: - name: Fetch Artifacts uses: actions/download-artifact@v2 diff --git a/src/fake_bpy_module/analyzer.py b/src/fake_bpy_module/analyzer.py index 7097e142..4c151f6f 100644 --- a/src/fake_bpy_module/analyzer.py +++ b/src/fake_bpy_module/analyzer.py @@ -109,6 +109,9 @@ def _parse_module(self, file: IO[Any], level: int) -> str: if version == [2, 91]: if module_name == "bpy.data": module_name = "bpy" + if version == [2, 92]: + if module_name == "bpy.data": + module_name = "bpy" return module_name diff --git a/src/gen.py b/src/gen.py index bb5aaf34..9a8b288a 100644 --- a/src/gen.py +++ b/src/gen.py @@ -11,7 +11,7 @@ SUPPORTED_TARGET: List[str] = ["pycharm"] SUPPORTED_STYLE_FORMAT: List[str] = ["none", "pep8"] SUPPORTED_MOD_BLENDER_VERSION: List[str] = [ - "2.78", "2.79", "2.80", "2.81", "2.82", "2.83", "2.90", "2.91" + "2.78", "2.79", "2.80", "2.81", "2.82", "2.83", "2.90", "2.91", "2.92" ] MOD_FILES_DIR: str = os.path.dirname(os.path.abspath(__file__)) diff --git a/src/gen_module.sh b/src/gen_module.sh index f5dfdc11..763bc77e 100755 --- a/src/gen_module.sh +++ b/src/gen_module.sh @@ -78,23 +78,28 @@ function apply_workaround() { local ref=${git_ref} local blender_source=${source_dir} - pushd "${blender_source}" > /dev/null + if [ ${ref} = "v2.90.0" -o ${ref} = "v2.91.0" ]; then + pushd "${blender_source}" > /dev/null - # Workaround for an error of rst document generation. - # See https://developer.blender.org/T80364 for detail. - cp doc/python_api/sphinx_doc_gen.py doc/python_api/sphinx_doc_gen.py.orig - sed -i -e "/Hair/s/^/#/" doc/python_api/sphinx_doc_gen.py - sed -i -e "/PointCloud/s/^/#/" doc/python_api/sphinx_doc_gen.py + # Workaround for an error of rst document generation. + # See https://developer.blender.org/T80364 for detail. + cp doc/python_api/sphinx_doc_gen.py doc/python_api/sphinx_doc_gen.py.orig + sed -i -e "/Hair/s/^/#/" doc/python_api/sphinx_doc_gen.py + sed -i -e "/PointCloud/s/^/#/" doc/python_api/sphinx_doc_gen.py - popd > /dev/null + popd > /dev/null + fi } function revert_workaround() { + local ref=${git_ref} local blender_source=${source_dir} - pushd "${blender_source}" > /dev/null - git checkout doc/python_api/sphinx_doc_gen.py - popd > /dev/null + if [ ${ref} = "v2.90.0" -o ${ref} = "v2.91.0" ]; then + pushd "${blender_source}" > /dev/null + git checkout doc/python_api/sphinx_doc_gen.py + popd > /dev/null + fi } # generate .rst documents diff --git a/src/patches/2.92/sphinx-in/bpy.types.BlendData.rst.patch b/src/patches/2.92/sphinx-in/bpy.types.BlendData.rst.patch new file mode 100644 index 00000000..7529374f --- /dev/null +++ b/src/patches/2.92/sphinx-in/bpy.types.BlendData.rst.patch @@ -0,0 +1,20 @@ +--- gen_module-tmp/sphinx-in.orig/bpy.types.BlendData.rst 2021-02-21 15:19:55.246367030 +0900 ++++ gen_module-tmp/sphinx-in/bpy.types.BlendData.rst 2021-02-21 21:21:37.934880923 +0900 +@@ -273,7 +273,7 @@ base class --- :class:`bpy_struct` + + :type: :class:`BlendDataWorlds` :class:`bpy_prop_collection` of :class:`World`, (readonly) + +- .. method:: batch_remove(ids=(id1, id2, ...)) ++ .. method:: batch_remove(ids=()) + + Remove (delete) several IDs at once. + +@@ -311,7 +311,7 @@ base class --- :class:`bpy_struct` + WARNING: Considered experimental feature currently. + + +- .. method:: user_map([subset=(id1, id2, ...)], key_types={..}, value_types={..}) ++ .. method:: user_map(subset, key_types, value_types) + + Returns a mapping of all ID data-blocks in current ``bpy.data`` to a set of all datablocks using them. + diff --git a/src/patches/2.92/sphinx-in/bpy.types.UILayout.rst.patch b/src/patches/2.92/sphinx-in/bpy.types.UILayout.rst.patch new file mode 100644 index 00000000..e7ec3436 --- /dev/null +++ b/src/patches/2.92/sphinx-in/bpy.types.UILayout.rst.patch @@ -0,0 +1,29 @@ +--- gen_module-tmp/sphinx-in.orig/bpy.types.UILayout.rst 2021-02-21 09:07:55.314600726 +0900 ++++ gen_module-tmp/sphinx-in/bpy.types.UILayout.rst 2021-02-21 15:18:32.379909367 +0900 +@@ -474,7 +474,7 @@ base class --- :class:`bpy_struct` + + :type icon: enum in ['NONE', 'QUESTION', 'ERROR', 'CANCEL', 'TRIA_RIGHT', 'TRIA_DOWN', 'TRIA_LEFT', 'TRIA_UP', 'ARROW_LEFTRIGHT', 'PLUS', 'DISCLOSURE_TRI_RIGHT', 'DISCLOSURE_TRI_DOWN', 'RADIOBUT_OFF', 'RADIOBUT_ON', 'MENU_PANEL', 'BLENDER', 'GRIP', 'DOT', 'COLLAPSEMENU', 'X', 'DUPLICATE', 'TRASH', 'COLLECTION_NEW', 'OPTIONS', 'NODE', 'NODE_SEL', 'WINDOW', 'WORKSPACE', 'RIGHTARROW_THIN', 'BORDERMOVE', 'VIEWZOOM', 'ADD', 'REMOVE', 'PANEL_CLOSE', 'COPY_ID', 'EYEDROPPER', 'CHECKMARK', 'AUTO', 'CHECKBOX_DEHLT', 'CHECKBOX_HLT', 'UNLOCKED', 'LOCKED', 'UNPINNED', 'PINNED', 'SCREEN_BACK', 'RIGHTARROW', 'DOWNARROW_HLT', 'FCURVE_SNAPSHOT', 'OBJECT_HIDDEN', 'TOPBAR', 'STATUSBAR', 'PLUGIN', 'HELP', 'GHOST_ENABLED', 'COLOR', 'UNLINKED', 'LINKED', 'HAND', 'ZOOM_ALL', 'ZOOM_SELECTED', 'ZOOM_PREVIOUS', 'ZOOM_IN', 'ZOOM_OUT', 'DRIVER_DISTANCE', 'DRIVER_ROTATIONAL_DIFFERENCE', 'DRIVER_TRANSFORM', 'FREEZE', 'STYLUS_PRESSURE', 'GHOST_DISABLED', 'FILE_NEW', 'FILE_TICK', 'QUIT', 'URL', 'RECOVER_LAST', 'THREE_DOTS', 'FULLSCREEN_ENTER', 'FULLSCREEN_EXIT', 'BRUSHES_ALL', 'LIGHT', 'MATERIAL', 'TEXTURE', 'ANIM', 'WORLD', 'SCENE', 'OUTPUT', 'SCRIPT', 'PARTICLES', 'PHYSICS', 'SPEAKER', 'TOOL_SETTINGS', 'SHADERFX', 'MODIFIER', 'BLANK1', 'FAKE_USER_OFF', 'FAKE_USER_ON', 'VIEW3D', 'GRAPH', 'OUTLINER', 'PROPERTIES', 'FILEBROWSER', 'IMAGE', 'INFO', 'SEQUENCE', 'TEXT', 'SOUND', 'ACTION', 'NLA', 'PREFERENCES', 'TIME', 'NODETREE', 'CONSOLE', 'TRACKER', 'ASSET_MANAGER', 'NODE_COMPOSITING', 'NODE_TEXTURE', 'NODE_MATERIAL', 'UV', 'OBJECT_DATAMODE', 'EDITMODE_HLT', 'UV_DATA', 'VPAINT_HLT', 'TPAINT_HLT', 'WPAINT_HLT', 'SCULPTMODE_HLT', 'POSE_HLT', 'PARTICLEMODE', 'TRACKING', 'TRACKING_BACKWARDS', 'TRACKING_FORWARDS', 'TRACKING_BACKWARDS_SINGLE', 'TRACKING_FORWARDS_SINGLE', 'TRACKING_CLEAR_BACKWARDS', 'TRACKING_CLEAR_FORWARDS', 'TRACKING_REFINE_BACKWARDS', 'TRACKING_REFINE_FORWARDS', 'SCENE_DATA', 'RENDERLAYERS', 'WORLD_DATA', 'OBJECT_DATA', 'MESH_DATA', 'CURVE_DATA', 'META_DATA', 'LATTICE_DATA', 'LIGHT_DATA', 'MATERIAL_DATA', 'TEXTURE_DATA', 'ANIM_DATA', 'CAMERA_DATA', 'PARTICLE_DATA', 'LIBRARY_DATA_DIRECT', 'GROUP', 'ARMATURE_DATA', 'COMMUNITY', 'BONE_DATA', 'CONSTRAINT', 'SHAPEKEY_DATA', 'CONSTRAINT_BONE', 'CAMERA_STEREO', 'PACKAGE', 'UGLYPACKAGE', 'EXPERIMENTAL', 'BRUSH_DATA', 'IMAGE_DATA', 'FILE', 'FCURVE', 'FONT_DATA', 'RENDER_RESULT', 'SURFACE_DATA', 'EMPTY_DATA', 'PRESET', 'RENDER_ANIMATION', 'RENDER_STILL', 'LIBRARY_DATA_BROKEN', 'BOIDS', 'STRANDS', 'LIBRARY_DATA_INDIRECT', 'GREASEPENCIL', 'LINE_DATA', 'LIBRARY_DATA_OVERRIDE', 'GROUP_BONE', 'GROUP_VERTEX', 'GROUP_VCOL', 'GROUP_UVS', 'FACE_MAPS', 'RNA', 'RNA_ADD', 'MOUSE_LMB', 'MOUSE_MMB', 'MOUSE_RMB', 'MOUSE_MOVE', 'MOUSE_LMB_DRAG', 'MOUSE_MMB_DRAG', 'MOUSE_RMB_DRAG', 'MEMORY', 'PRESET_NEW', 'DECORATE', 'DECORATE_KEYFRAME', 'DECORATE_ANIMATE', 'DECORATE_DRIVER', 'DECORATE_LINKED', 'DECORATE_LIBRARY_OVERRIDE', 'DECORATE_UNLOCKED', 'DECORATE_LOCKED', 'DECORATE_OVERRIDE', 'FUND', 'TRACKER_DATA', 'HEART', 'ORPHAN_DATA', 'USER', 'SYSTEM', 'SETTINGS', 'OUTLINER_OB_EMPTY', 'OUTLINER_OB_MESH', 'OUTLINER_OB_CURVE', 'OUTLINER_OB_LATTICE', 'OUTLINER_OB_META', 'OUTLINER_OB_LIGHT', 'OUTLINER_OB_CAMERA', 'OUTLINER_OB_ARMATURE', 'OUTLINER_OB_FONT', 'OUTLINER_OB_SURFACE', 'OUTLINER_OB_SPEAKER', 'OUTLINER_OB_FORCE_FIELD', 'OUTLINER_OB_GROUP_INSTANCE', 'OUTLINER_OB_GREASEPENCIL', 'OUTLINER_OB_LIGHTPROBE', 'OUTLINER_OB_IMAGE', 'OUTLINER_COLLECTION', 'RESTRICT_COLOR_OFF', 'RESTRICT_COLOR_ON', 'HIDE_ON', 'HIDE_OFF', 'RESTRICT_SELECT_ON', 'RESTRICT_SELECT_OFF', 'RESTRICT_RENDER_ON', 'RESTRICT_RENDER_OFF', 'RESTRICT_INSTANCED_OFF', 'OUTLINER_DATA_EMPTY', 'OUTLINER_DATA_MESH', 'OUTLINER_DATA_CURVE', 'OUTLINER_DATA_LATTICE', 'OUTLINER_DATA_META', 'OUTLINER_DATA_LIGHT', 'OUTLINER_DATA_CAMERA', 'OUTLINER_DATA_ARMATURE', 'OUTLINER_DATA_FONT', 'OUTLINER_DATA_SURFACE', 'OUTLINER_DATA_SPEAKER', 'OUTLINER_DATA_LIGHTPROBE', 'OUTLINER_DATA_GP_LAYER', 'OUTLINER_DATA_GREASEPENCIL', 'GP_SELECT_POINTS', 'GP_SELECT_STROKES', 'GP_MULTIFRAME_EDITING', 'GP_ONLY_SELECTED', 'GP_SELECT_BETWEEN_STROKES', 'MODIFIER_OFF', 'MODIFIER_ON', 'ONIONSKIN_OFF', 'ONIONSKIN_ON', 'RESTRICT_VIEW_ON', 'RESTRICT_VIEW_OFF', 'RESTRICT_INSTANCED_ON', 'MESH_PLANE', 'MESH_CUBE', 'MESH_CIRCLE', 'MESH_UVSPHERE', 'MESH_ICOSPHERE', 'MESH_GRID', 'MESH_MONKEY', 'MESH_CYLINDER', 'MESH_TORUS', 'MESH_CONE', 'MESH_CAPSULE', 'EMPTY_SINGLE_ARROW', 'LIGHT_POINT', 'LIGHT_SUN', 'LIGHT_SPOT', 'LIGHT_HEMI', 'LIGHT_AREA', 'CUBE', 'SPHERE', 'CONE', 'META_PLANE', 'META_CUBE', 'META_BALL', 'META_ELLIPSOID', 'META_CAPSULE', 'SURFACE_NCURVE', 'SURFACE_NCIRCLE', 'SURFACE_NSURFACE', 'SURFACE_NCYLINDER', 'SURFACE_NSPHERE', 'SURFACE_NTORUS', 'EMPTY_AXIS', 'STROKE', 'EMPTY_ARROWS', 'CURVE_BEZCURVE', 'CURVE_BEZCIRCLE', 'CURVE_NCURVE', 'CURVE_NCIRCLE', 'CURVE_PATH', 'LIGHTPROBE_CUBEMAP', 'LIGHTPROBE_PLANAR', 'LIGHTPROBE_GRID', 'COLOR_RED', 'COLOR_GREEN', 'COLOR_BLUE', 'TRIA_RIGHT_BAR', 'TRIA_DOWN_BAR', 'TRIA_LEFT_BAR', 'TRIA_UP_BAR', 'FORCE_FORCE', 'FORCE_WIND', 'FORCE_VORTEX', 'FORCE_MAGNETIC', 'FORCE_HARMONIC', 'FORCE_CHARGE', 'FORCE_LENNARDJONES', 'FORCE_TEXTURE', 'FORCE_CURVE', 'FORCE_BOID', 'FORCE_TURBULENCE', 'FORCE_DRAG', 'FORCE_FLUIDFLOW', 'RIGID_BODY', 'RIGID_BODY_CONSTRAINT', 'IMAGE_PLANE', 'IMAGE_BACKGROUND', 'IMAGE_REFERENCE', 'NODE_INSERT_ON', 'NODE_INSERT_OFF', 'NODE_TOP', 'NODE_SIDE', 'NODE_CORNER', 'ANCHOR_TOP', 'ANCHOR_BOTTOM', 'ANCHOR_LEFT', 'ANCHOR_RIGHT', 'ANCHOR_CENTER', 'SELECT_SET', 'SELECT_EXTEND', 'SELECT_SUBTRACT', 'SELECT_INTERSECT', 'SELECT_DIFFERENCE', 'ALIGN_LEFT', 'ALIGN_CENTER', 'ALIGN_RIGHT', 'ALIGN_JUSTIFY', 'ALIGN_FLUSH', 'ALIGN_TOP', 'ALIGN_MIDDLE', 'ALIGN_BOTTOM', 'BOLD', 'ITALIC', 'UNDERLINE', 'SMALL_CAPS', 'CON_ACTION', 'HOLDOUT_OFF', 'HOLDOUT_ON', 'INDIRECT_ONLY_OFF', 'INDIRECT_ONLY_ON', 'CON_CAMERASOLVER', 'CON_FOLLOWTRACK', 'CON_OBJECTSOLVER', 'CON_LOCLIKE', 'CON_ROTLIKE', 'CON_SIZELIKE', 'CON_TRANSLIKE', 'CON_DISTLIMIT', 'CON_LOCLIMIT', 'CON_ROTLIMIT', 'CON_SIZELIMIT', 'CON_SAMEVOL', 'CON_TRANSFORM', 'CON_TRANSFORM_CACHE', 'CON_CLAMPTO', 'CON_KINEMATIC', 'CON_LOCKTRACK', 'CON_SPLINEIK', 'CON_STRETCHTO', 'CON_TRACKTO', 'CON_ARMATURE', 'CON_CHILDOF', 'CON_FLOOR', 'CON_FOLLOWPATH', 'CON_PIVOT', 'CON_SHRINKWRAP', 'MODIFIER_DATA', 'MOD_WAVE', 'MOD_BUILD', 'MOD_DECIM', 'MOD_MIRROR', 'MOD_SOFT', 'MOD_SUBSURF', 'HOOK', 'MOD_PHYSICS', 'MOD_PARTICLES', 'MOD_BOOLEAN', 'MOD_EDGESPLIT', 'MOD_ARRAY', 'MOD_UVPROJECT', 'MOD_DISPLACE', 'MOD_CURVE', 'MOD_LATTICE', 'MOD_TINT', 'MOD_ARMATURE', 'MOD_SHRINKWRAP', 'MOD_CAST', 'MOD_MESHDEFORM', 'MOD_BEVEL', 'MOD_SMOOTH', 'MOD_SIMPLEDEFORM', 'MOD_MASK', 'MOD_CLOTH', 'MOD_EXPLODE', 'MOD_FLUIDSIM', 'MOD_MULTIRES', 'MOD_FLUID', 'MOD_SOLIDIFY', 'MOD_SCREW', 'MOD_VERTEX_WEIGHT', 'MOD_DYNAMICPAINT', 'MOD_REMESH', 'MOD_OCEAN', 'MOD_WARP', 'MOD_SKIN', 'MOD_TRIANGULATE', 'MOD_WIREFRAME', 'MOD_DATA_TRANSFER', 'MOD_NORMALEDIT', 'MOD_PARTICLE_INSTANCE', 'MOD_HUE_SATURATION', 'MOD_NOISE', 'MOD_OFFSET', 'MOD_SIMPLIFY', 'MOD_THICKNESS', 'MOD_INSTANCE', 'MOD_TIME', 'MOD_OPACITY', 'REC', 'PLAY', 'FF', 'REW', 'PAUSE', 'PREV_KEYFRAME', 'NEXT_KEYFRAME', 'PLAY_SOUND', 'PLAY_REVERSE', 'PREVIEW_RANGE', 'ACTION_TWEAK', 'PMARKER_ACT', 'PMARKER_SEL', 'PMARKER', 'MARKER_HLT', 'MARKER', 'KEYFRAME_HLT', 'KEYFRAME', 'KEYINGSET', 'KEY_DEHLT', 'KEY_HLT', 'MUTE_IPO_OFF', 'MUTE_IPO_ON', 'DRIVER', 'SOLO_OFF', 'SOLO_ON', 'FRAME_PREV', 'FRAME_NEXT', 'NLA_PUSHDOWN', 'IPO_CONSTANT', 'IPO_LINEAR', 'IPO_BEZIER', 'IPO_SINE', 'IPO_QUAD', 'IPO_CUBIC', 'IPO_QUART', 'IPO_QUINT', 'IPO_EXPO', 'IPO_CIRC', 'IPO_BOUNCE', 'IPO_ELASTIC', 'IPO_BACK', 'IPO_EASE_IN', 'IPO_EASE_OUT', 'IPO_EASE_IN_OUT', 'NORMALIZE_FCURVES', 'VERTEXSEL', 'EDGESEL', 'FACESEL', 'CURSOR', 'PIVOT_BOUNDBOX', 'PIVOT_CURSOR', 'PIVOT_INDIVIDUAL', 'PIVOT_MEDIAN', 'PIVOT_ACTIVE', 'CENTER_ONLY', 'ROOTCURVE', 'SMOOTHCURVE', 'SPHERECURVE', 'INVERSESQUARECURVE', 'SHARPCURVE', 'LINCURVE', 'NOCURVE', 'RNDCURVE', 'PROP_OFF', 'PROP_ON', 'PROP_CON', 'PROP_PROJECTED', 'PARTICLE_POINT', 'PARTICLE_TIP', 'PARTICLE_PATH', 'SNAP_FACE_CENTER', 'SNAP_PERPENDICULAR', 'SNAP_MIDPOINT', 'SNAP_OFF', 'SNAP_ON', 'SNAP_NORMAL', 'SNAP_GRID', 'SNAP_VERTEX', 'SNAP_EDGE', 'SNAP_FACE', 'SNAP_VOLUME', 'SNAP_INCREMENT', 'STICKY_UVS_LOC', 'STICKY_UVS_DISABLE', 'STICKY_UVS_VERT', 'CLIPUV_DEHLT', 'CLIPUV_HLT', 'SNAP_PEEL_OBJECT', 'GRID', 'OBJECT_ORIGIN', 'ORIENTATION_GLOBAL', 'ORIENTATION_GIMBAL', 'ORIENTATION_LOCAL', 'ORIENTATION_NORMAL', 'ORIENTATION_VIEW', 'COPYDOWN', 'PASTEDOWN', 'PASTEFLIPUP', 'PASTEFLIPDOWN', 'VIS_SEL_11', 'VIS_SEL_10', 'VIS_SEL_01', 'VIS_SEL_00', 'AUTOMERGE_OFF', 'AUTOMERGE_ON', 'UV_VERTEXSEL', 'UV_EDGESEL', 'UV_FACESEL', 'UV_ISLANDSEL', 'UV_SYNC_SELECT', 'TRANSFORM_ORIGINS', 'GIZMO', 'ORIENTATION_CURSOR', 'NORMALS_VERTEX', 'NORMALS_FACE', 'NORMALS_VERTEX_FACE', 'SHADING_BBOX', 'SHADING_WIRE', 'SHADING_SOLID', 'SHADING_RENDERED', 'SHADING_TEXTURE', 'OVERLAY', 'XRAY', 'LOCKVIEW_OFF', 'LOCKVIEW_ON', 'AXIS_SIDE', 'AXIS_FRONT', 'AXIS_TOP', 'LAYER_USED', 'LAYER_ACTIVE', 'OUTLINER_OB_HAIR', 'OUTLINER_DATA_HAIR', 'HAIR_DATA', 'OUTLINER_OB_POINTCLOUD', 'OUTLINER_DATA_POINTCLOUD', 'POINTCLOUD_DATA', 'OUTLINER_OB_VOLUME', 'OUTLINER_DATA_VOLUME', 'VOLUME_DATA', 'HOME', 'DOCUMENTS', 'TEMP', 'SORTALPHA', 'SORTBYEXT', 'SORTTIME', 'SORTSIZE', 'SHORTDISPLAY', 'LONGDISPLAY', 'IMGDISPLAY', 'BOOKMARKS', 'FONTPREVIEW', 'FILTER', 'NEWFOLDER', 'FOLDER_REDIRECT', 'FILE_PARENT', 'FILE_REFRESH', 'FILE_FOLDER', 'FILE_BLANK', 'FILE_BLEND', 'FILE_IMAGE', 'FILE_MOVIE', 'FILE_SCRIPT', 'FILE_SOUND', 'FILE_FONT', 'FILE_TEXT', 'SORT_DESC', 'SORT_ASC', 'LINK_BLEND', 'APPEND_BLEND', 'IMPORT', 'EXPORT', 'LOOP_BACK', 'LOOP_FORWARDS', 'BACK', 'FORWARD', 'FILE_ARCHIVE', 'FILE_CACHE', 'FILE_VOLUME', 'FILE_3D', 'FILE_HIDDEN', 'FILE_BACKUP', 'DISK_DRIVE', 'MATPLANE', 'MATSPHERE', 'MATCUBE', 'MONKEY', 'HAIR', 'ALIASED', 'ANTIALIASED', 'MAT_SPHERE_SKY', 'MATSHADERBALL', 'MATCLOTH', 'MATFLUID', 'WORDWRAP_OFF', 'WORDWRAP_ON', 'SYNTAX_OFF', 'SYNTAX_ON', 'LINENUMBERS_OFF', 'LINENUMBERS_ON', 'SCRIPTPLUGINS', 'DISC', 'DESKTOP', 'EXTERNAL_DRIVE', 'NETWORK_DRIVE', 'SEQ_SEQUENCER', 'SEQ_PREVIEW', 'SEQ_LUMA_WAVEFORM', 'SEQ_CHROMA_SCOPE', 'SEQ_HISTOGRAM', 'SEQ_SPLITVIEW', 'SEQ_STRIP_META', 'SEQ_STRIP_DUPLICATE', 'IMAGE_RGB', 'IMAGE_RGB_ALPHA', 'IMAGE_ALPHA', 'IMAGE_ZDEPTH', 'HANDLE_AUTOCLAMPED', 'HANDLE_AUTO', 'HANDLE_ALIGNED', 'HANDLE_VECTOR', 'HANDLE_FREE', 'VIEW_PERSPECTIVE', 'VIEW_ORTHO', 'VIEW_CAMERA', 'VIEW_PAN', 'VIEW_ZOOM', 'BRUSH_BLOB', 'BRUSH_BLUR', 'BRUSH_CLAY', 'BRUSH_CLAY_STRIPS', 'BRUSH_CLONE', 'BRUSH_CREASE', 'BRUSH_FILL', 'BRUSH_FLATTEN', 'BRUSH_GRAB', 'BRUSH_INFLATE', 'BRUSH_LAYER', 'BRUSH_MASK', 'BRUSH_MIX', 'BRUSH_NUDGE', 'BRUSH_PINCH', 'BRUSH_SCRAPE', 'BRUSH_SCULPT_DRAW', 'BRUSH_SMEAR', 'BRUSH_SMOOTH', 'BRUSH_SNAKE_HOOK', 'BRUSH_SOFTEN', 'BRUSH_TEXDRAW', 'BRUSH_TEXFILL', 'BRUSH_TEXMASK', 'BRUSH_THUMB', 'BRUSH_ROTATE', 'GPBRUSH_SMOOTH', 'GPBRUSH_THICKNESS', 'GPBRUSH_STRENGTH', 'GPBRUSH_GRAB', 'GPBRUSH_PUSH', 'GPBRUSH_TWIST', 'GPBRUSH_PINCH', 'GPBRUSH_RANDOMIZE', 'GPBRUSH_CLONE', 'GPBRUSH_WEIGHT', 'GPBRUSH_PENCIL', 'GPBRUSH_PEN', 'GPBRUSH_INK', 'GPBRUSH_INKNOISE', 'GPBRUSH_BLOCK', 'GPBRUSH_MARKER', 'GPBRUSH_FILL', 'GPBRUSH_AIRBRUSH', 'GPBRUSH_CHISEL', 'GPBRUSH_ERASE_SOFT', 'GPBRUSH_ERASE_HARD', 'GPBRUSH_ERASE_STROKE', 'SMALL_TRI_RIGHT_VEC', 'KEYTYPE_KEYFRAME_VEC', 'KEYTYPE_BREAKDOWN_VEC', 'KEYTYPE_EXTREME_VEC', 'KEYTYPE_JITTER_VEC', 'KEYTYPE_MOVING_HOLD_VEC', 'HANDLETYPE_FREE_VEC', 'HANDLETYPE_ALIGNED_VEC', 'HANDLETYPE_VECTOR_VEC', 'HANDLETYPE_AUTO_VEC', 'HANDLETYPE_AUTO_CLAMP_VEC', 'COLORSET_01_VEC', 'COLORSET_02_VEC', 'COLORSET_03_VEC', 'COLORSET_04_VEC', 'COLORSET_05_VEC', 'COLORSET_06_VEC', 'COLORSET_07_VEC', 'COLORSET_08_VEC', 'COLORSET_09_VEC', 'COLORSET_10_VEC', 'COLORSET_11_VEC', 'COLORSET_12_VEC', 'COLORSET_13_VEC', 'COLORSET_14_VEC', 'COLORSET_15_VEC', 'COLORSET_16_VEC', 'COLORSET_17_VEC', 'COLORSET_18_VEC', 'COLORSET_19_VEC', 'COLORSET_20_VEC', 'COLLECTION_COLOR_01', 'COLLECTION_COLOR_02', 'COLLECTION_COLOR_03', 'COLLECTION_COLOR_04', 'COLLECTION_COLOR_05', 'COLLECTION_COLOR_06', 'COLLECTION_COLOR_07', 'COLLECTION_COLOR_08', 'EVENT_A', 'EVENT_B', 'EVENT_C', 'EVENT_D', 'EVENT_E', 'EVENT_F', 'EVENT_G', 'EVENT_H', 'EVENT_I', 'EVENT_J', 'EVENT_K', 'EVENT_L', 'EVENT_M', 'EVENT_N', 'EVENT_O', 'EVENT_P', 'EVENT_Q', 'EVENT_R', 'EVENT_S', 'EVENT_T', 'EVENT_U', 'EVENT_V', 'EVENT_W', 'EVENT_X', 'EVENT_Y', 'EVENT_Z', 'EVENT_SHIFT', 'EVENT_CTRL', 'EVENT_ALT', 'EVENT_OS', 'EVENT_F1', 'EVENT_F2', 'EVENT_F3', 'EVENT_F4', 'EVENT_F5', 'EVENT_F6', 'EVENT_F7', 'EVENT_F8', 'EVENT_F9', 'EVENT_F10', 'EVENT_F11', 'EVENT_F12', 'EVENT_ESC', 'EVENT_TAB', 'EVENT_PAGEUP', 'EVENT_PAGEDOWN', 'EVENT_RETURN', 'EVENT_SPACEKEY'], (optional) + +- .. method:: prop_with_popover(data, property, text="", text_ctxt="", translate=True, icon='NONE', icon_only=False, panel) ++ .. method:: prop_with_popover(data, property, text="", text_ctxt="", translate=True, icon='NONE', icon_only=False, panel="") + + prop_with_popover + +@@ -519,7 +519,7 @@ base class --- :class:`bpy_struct` + + :type panel: string, (never None) + +- .. method:: prop_with_menu(data, property, text="", text_ctxt="", translate=True, icon='NONE', icon_only=False, menu) ++ .. method:: prop_with_menu(data, property, text="", text_ctxt="", translate=True, icon='NONE', icon_only=False, menu="") + + prop_with_menu + +@@ -749,7 +749,7 @@ base class --- :class:`bpy_struct` + + :rtype: :class:`OperatorProperties` + +- .. method:: operator_menu_hold(operator, text="", text_ctxt="", translate=True, icon='NONE', emboss=True, depress=False, icon_value=0, menu) ++ .. method:: operator_menu_hold(operator, text="", text_ctxt="", translate=True, icon='NONE', emboss=True, depress=False, icon_value=0, menu="") + + Item. Places a button into the layout to call an Operator + diff --git a/src/patches/2.92/sphinx-in/bpy.utils.previews.rst.patch b/src/patches/2.92/sphinx-in/bpy.utils.previews.rst.patch new file mode 100644 index 00000000..e0420beb --- /dev/null +++ b/src/patches/2.92/sphinx-in/bpy.utils.previews.rst.patch @@ -0,0 +1,10 @@ +--- gen_module-tmp/sphinx-in.orig/bpy.utils.previews.rst 2021-02-13 14:28:53.371495088 +0900 ++++ gen_module-tmp/sphinx-in/bpy.utils.previews.rst 2021-02-13 14:35:26.658597259 +0900 +@@ -73,7 +73,6 @@ Custom Icon Example + :type name: string + :return: The Preview matching given name, or a new empty one. + :rtype: :class:`bpy.types.ImagePreview` +- :rtype: :class:`bpy.types.ImagePreview` + :raises KeyError: if ``name`` already exists. + + diff --git a/src/patches/2.92/sphinx-in/freestyle.utils.rst.patch b/src/patches/2.92/sphinx-in/freestyle.utils.rst.patch new file mode 100644 index 00000000..68a3415c --- /dev/null +++ b/src/patches/2.92/sphinx-in/freestyle.utils.rst.patch @@ -0,0 +1,20 @@ +--- gen_module-tmp/sphinx-in.orig/freestyle.utils.rst 2021-02-22 14:35:24.800565946 +0900 ++++ gen_module-tmp/sphinx-in/freestyle.utils.rst 2021-02-22 20:11:12.634718063 +0900 +@@ -45,7 +45,7 @@ writing. + :rtype: int or float + + +-.. function:: angle_x_normal(it: Interface0DIterator) ++.. function:: angle_x_normal(it) + + unsigned angle between a Point's normal and the X axis, in radians + +@@ -115,7 +115,7 @@ writing. + + get the diffuse rgba color from an FEdge + +-.. function:: normal_at_I0D(it: Interface0DIterator) -> Vector ++.. function:: normal_at_I0D(it) -> Vector + + Normal at an Interface0D object. In contrast to Normal2DF0D this + function uses the actual data instead of underlying Fedge objects. diff --git a/src/patches/2.92/sphinx-in/mathutils.rst.patch b/src/patches/2.92/sphinx-in/mathutils.rst.patch new file mode 100644 index 00000000..960ba3fa --- /dev/null +++ b/src/patches/2.92/sphinx-in/mathutils.rst.patch @@ -0,0 +1,11 @@ +--- gen_module-tmp/sphinx-in.orig/mathutils.rst 2021-02-14 14:34:48.437320187 +0900 ++++ gen_module-tmp/sphinx-in/mathutils.rst 2021-02-14 20:18:33.425307407 +0900 +@@ -983,7 +983,7 @@ The :mod:`mathutils` module provides the + :type size: int + + +- .. classmethod:: Range(start=0, stop, step=1) ++ .. classmethod:: Range(start=0, stop=-1, step=1) + + Create a filled with a range of values. + diff --git a/tests/pylint_cycles.sh b/tests/pylint_cycles.sh index 32f2c0ae..cf562b19 100755 --- a/tests/pylint_cycles.sh +++ b/tests/pylint_cycles.sh @@ -17,7 +17,7 @@ declare -r IGNORED_PYLINT_ERRORS=( declare -r SUPPORTED_VERSIONS=( "2.78" "2.79" "2.80" "2.81" "2.82" "2.83" - "2.90" "2.91" + "2.90" "2.91" "2.92" ) declare -A BLENDER_TAG_NAME=( @@ -29,6 +29,7 @@ declare -A BLENDER_TAG_NAME=( ["v2.83"]="v2.83.9" ["v2.90"]="v2.90.0" ["v2.91"]="v2.91.0" + ["v2.92"]="v2.92.0" ) version=${1} diff --git a/tools/pip_package/build_pip_package.sh b/tools/pip_package/build_pip_package.sh index f95c5dd1..8d148019 100755 --- a/tools/pip_package/build_pip_package.sh +++ b/tools/pip_package/build_pip_package.sh @@ -5,7 +5,7 @@ set -eEu SUPPORTED_VERSIONS=( "2.78" "2.79" "2.80" "2.81" "2.82" "2.83" - "2.90" "2.91" + "2.90" "2.91" "2.92" ) declare -A BLENDER_TAG_NAME=( @@ -17,6 +17,7 @@ declare -A BLENDER_TAG_NAME=( ["v2.83"]="v2.83.9" ["v2.90"]="v2.90.0" ["v2.91"]="v2.91.0" + ["v2.92"]="v2.92.0" ) TMP_DIR_NAME="tmp" diff --git a/tools/utils/download_blender.sh b/tools/utils/download_blender.sh index e2293215..65d42581 100755 --- a/tools/utils/download_blender.sh +++ b/tools/utils/download_blender.sh @@ -5,7 +5,7 @@ set -eEu SUPPORTED_VERSIONS=( "2.78" "2.79" "2.80" "2.81" "2.82" "2.83" - "2.90" "2.91" + "2.90" "2.91" "2.92" "all" ) @@ -18,6 +18,7 @@ declare -A BLENDER_DOWNLOAD_URL_MACOSX=( ["v2.83"]="https://download.blender.org/release/Blender2.83/blender-2.83.9-macOS.dmg" ["v2.90"]="" ["v2.91"]="" + ["v2.92"]="" ) declare -A BLENDER_DOWNLOAD_URL_WIN64=( @@ -29,6 +30,7 @@ declare -A BLENDER_DOWNLOAD_URL_WIN64=( ["v2.83"]="https://download.blender.org/release/Blender2.83/blender-2.83.9-windows64.zip" ["v2.90"]="https://download.blender.org/release/Blender2.90/blender-2.90.0-windows64.zip" ["v2.91"]="https://download.blender.org/release/Blender2.91/blender-2.91.0-windows64.zip" + ["v2.92"]="https://download.blender.org/release/Blender2.92/blender-2.92.0-windows64.zip" ) declare -A BLENDER_DOWNLOAD_URL_LINUX=( @@ -40,6 +42,7 @@ declare -A BLENDER_DOWNLOAD_URL_LINUX=( ["v2.83"]="https://download.blender.org/release/Blender2.83/blender-2.83.9-linux64.tar.xz" ["v2.90"]="https://download.blender.org/release/Blender2.90/blender-2.90.0-linux64.tar.xz" ["v2.91"]="https://download.blender.org/release/Blender2.91/blender-2.91.0-linux64.tar.xz" + ["v2.92"]="https://download.blender.org/release/Blender2.92/blender-2.92.0-linux64.tar.xz" ) declare -A NEED_MOVE_MACOSX=( @@ -59,6 +62,7 @@ declare -A NEED_MOVE_LINUX=( ["v2.83"]="blender-2.83.9-linux64" ["v2.90"]="blender-2.90.0-linux64" ["v2.91"]="blender-2.91.0-linux64" + ["v2.92"]="blender-2.92.0-linux64" ) declare -A BLENDER_CHECKSUM_URL=( @@ -70,6 +74,7 @@ declare -A BLENDER_CHECKSUM_URL=( ["v2.83"]="https://download.blender.org/release/Blender2.83/blender-2.83.9.md5" ["v2.90"]="https://download.blender.org/release/Blender2.90/blender-2.90.0.md5" ["v2.91"]="https://download.blender.org/release/Blender2.91/blender-2.91.0.md5" + ["v2.92"]="https://download.blender.org/release/Blender2.92/blender-2.92.0.md5" ) function get_extractor() {