Skip to content

Remove show property from annotation hook #727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eloisebrosseau merged 2 commits into from
Apr 1, 2025
Merged

Remove show property from annotation hook #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71c6fd9
Remove show property from annotation hook
eloisebrosseau Mar 24, 2025
0e7679b
Update OTIO version for the Windows debug build
eloisebrosseau Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 13 additions & 31 deletions cmake/dependencies/python3.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,9 @@ SET(PYTHON_VERSION_MAJOR
3
)

RV_VFX_SET_VARIABLE(
PYTHON_VERSION_MINOR
CY2023 "10"
CY2024 "11"
)
RV_VFX_SET_VARIABLE(PYTHON_VERSION_MINOR CY2023 "10" CY2024 "11")

RV_VFX_SET_VARIABLE(
PYTHON_VERSION_PATCH
CY2023 "13"
CY2024 "9"
)
RV_VFX_SET_VARIABLE(PYTHON_VERSION_PATCH CY2023 "13" CY2024 "9")

SET(_python3_version
"${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}"
Expand All @@ -44,24 +36,19 @@ SET(RV_DEPS_PYTHON_VERSION_SHORT
)

SET(_opentimelineio_version
"0.15"
"0.16.0"
)

RV_VFX_SET_VARIABLE(
_pyside2_version
CY2023 "5.15.10"
_pyside2_version CY2023 "5.15.10"
# Need 5.15.11+ to support Python 3.11.
CY2024 "5.15.11"
)

SET(_python3_download_url
"https://github.com/python/cpython/archive/refs/tags/v${_python3_version}.zip"
)
RV_VFX_SET_VARIABLE(
_python3_download_hash
CY2023 "21b32503f31386b37f0c42172dfe5637"
CY2024 "392eccd4386936ffcc46ed08057db3e7"
)
RV_VFX_SET_VARIABLE(_python3_download_hash CY2023 "21b32503f31386b37f0c42172dfe5637" CY2024 "392eccd4386936ffcc46ed08057db3e7")

SET(_opentimelineio_download_url
"https://github.com/AcademySoftwareFoundation/OpenTimelineIO"
Expand All @@ -73,11 +60,7 @@ SET(_opentimelineio_git_tag
SET(_pyside2_archive_url
"https://mirrors.ocf.berkeley.edu/qt/official_releases/QtForPython/pyside2/PySide2-${_pyside2_version}-src/pyside-setup-opensource-src-${_pyside2_version}.zip"
)
RV_VFX_SET_VARIABLE(
_pyside2_download_hash
CY2023 "87841aaced763b6b52e9b549e31a493f"
CY2024 "8f652b08c1c74f9a80a2c0f16ff2a4ca"
)
RV_VFX_SET_VARIABLE(_pyside2_download_hash CY2023 "87841aaced763b6b52e9b549e31a493f" CY2024 "8f652b08c1c74f9a80a2c0f16ff2a4ca")

SET(_install_dir
${RV_DEPS_BASE_DIR}/${_python3_target}/install
Expand Down Expand Up @@ -236,20 +219,19 @@ SET(_requirements_install_command
)

IF(RV_TARGET_WINDOWS)
SET(_patch_python3_11_command
SET(_patch_python3_11_command
"patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patch/python.3.11.openssl.props.patch &&\
patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patch/python.3.11.python.props.patch &&\
patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patch/python.3.11.get_externals.bat.patch"
)

RV_VFX_SET_VARIABLE(
_patch_command
CY2023 ""
CY2024 "${_patch_python3_11_command}"
)
RV_VFX_SET_VARIABLE(_patch_command CY2023 "" CY2024 "${_patch_python3_11_command}")
# Split the command into a semi-colon separated list.
separate_arguments(_patch_command)
STRING(REGEX REPLACE ";+" ";" _patch_command "${_patch_command}")
SEPARATE_ARGUMENTS(_patch_command)
STRING(
REGEX
REPLACE ";+" ";" _patch_command "${_patch_command}"
)
ENDIF()

EXTERNALPROJECT_ADD(
Expand Down
4 changes: 1 addition & 3 deletions src/plugins/rv-packages/otio_reader/annotation_hook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ def hook_function(
frame_component = f"{paint_node}.frame:{frame}"

# Set properties on the paint component of the RVPaint node
effectHook.set_rv_effect_props(
paint_component, {"nextId": stroke_id + 1, "show": layer.visible}
)
effectHook.set_rv_effect_props(paint_component, {"nextId": stroke_id + 1})

# Add and set properties on the pen component of the RVPaint node
effectHook.add_rv_effect_props(
Expand Down