mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 21:04:40 +01:00
Merge pull request #5341 from tokejepsen/bugfix/OP-5375_Extract-look-is-not-AYON-compatible
This commit is contained in:
commit
6e574aff4d
2 changed files with 15 additions and 9 deletions
|
|
@ -37,13 +37,7 @@ class CreateLook(plugin.MayaCreator):
|
|||
label="Convert textures to .rstex",
|
||||
tooltip="Whether to generate Redshift .rstex files for "
|
||||
"your textures",
|
||||
default=self.rs_tex),
|
||||
BoolDef("forceCopy",
|
||||
label="Force Copy",
|
||||
tooltip="Enable users to force a copy instead of hardlink."
|
||||
"\nNote: On Windows copy is always forced due to "
|
||||
"bugs in windows' implementation of hardlinks.",
|
||||
default=False)
|
||||
default=self.rs_tex)
|
||||
]
|
||||
|
||||
def get_pre_create_attr_defs(self):
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import contextlib
|
|||
import json
|
||||
import logging
|
||||
import os
|
||||
import platform
|
||||
import tempfile
|
||||
import six
|
||||
import attr
|
||||
|
|
@ -25,6 +24,7 @@ from openpype.lib import (
|
|||
|
||||
from openpype.pipeline import legacy_io, publish, KnownPublishError
|
||||
from openpype.hosts.maya.api import lib
|
||||
from openpype import AYON_SERVER_ENABLED
|
||||
|
||||
# Modes for transfer
|
||||
COPY = 1
|
||||
|
|
@ -57,6 +57,12 @@ def find_paths_by_hash(texture_hash):
|
|||
str: path to texture if found.
|
||||
|
||||
"""
|
||||
if AYON_SERVER_ENABLED:
|
||||
raise KnownPublishError(
|
||||
"This is a bug. \"find_paths_by_hash\" is not compatible with "
|
||||
"AYON."
|
||||
)
|
||||
|
||||
key = "data.sourceHashes.{0}".format(texture_hash)
|
||||
return legacy_io.distinct(key, {"type": "version"})
|
||||
|
||||
|
|
@ -589,7 +595,13 @@ class ExtractLook(publish.Extractor):
|
|||
resources = instance.data["resources"]
|
||||
color_management = lib.get_color_management_preferences()
|
||||
|
||||
force_copy = instance.data.get("forceCopy", False)
|
||||
# TODO: Temporary disable all hardlinking, due to the feature not being
|
||||
# used or properly working.
|
||||
self.log.info(
|
||||
"Forcing copy instead of hardlink."
|
||||
)
|
||||
force_copy = True
|
||||
|
||||
if not force_copy and platform.system().lower() == "windows":
|
||||
# Temporary fix to NOT create hardlinks on windows machines
|
||||
self.log.warning(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue