maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only use relative paths when path/reference are on the same drive

Browse source
This commit is contained in:
Moritz Brückner 2020-12-17 22:25:00 +01:00
parent 882dea8d6c
commit d7e5d07e52
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
blender/arm/write_data.py
View file

@ -8,17 +8,28 @@ import arm.utils
import arm.assets as assets
import arm.make_state as state
def add_armory_library(sdk_path, name, rel_path=False):
if rel_path:
sdk_path = '../' + os.path.relpath(sdk_path, arm.utils.get_fp()).replace('\\', '/')
def on_same_drive(path1: str, path2: str) -> bool:
drive_path1, _ = os.path.splitdrive(path1)
drive_path2, _ = os.path.splitdrive(path2)
return drive_path1 == drive_path2
def add_armory_library(sdk_path: str, name: str, rel_path=False) -> str:
project_path = arm.utils.get_fp()
if rel_path and on_same_drive(sdk_path, project_path):
sdk_path = '../' + os.path.relpath(sdk_path, project_path).replace('\\', '/')
return ('project.addLibrary("' + sdk_path + '/' + name + '");\n').replace('\\', '/').replace('//', '/')
def add_assets(path, quality=1.0, use_data_dir=False, rel_path=False):
def add_assets(path: str, quality=1.0, use_data_dir=False, rel_path=False) -> str:
if not bpy.data.worlds['Arm'].arm_minimize and path.endswith('.arm'):
path = path[:-4] + '.json'
if rel_path:
path = os.path.relpath(path, arm.utils.get_fp()).replace('\\', '/')
project_path = arm.utils.get_fp()
if rel_path and on_same_drive(path, project_path):
path = os.path.relpath(path, project_path).replace('\\', '/')
notinlist = not path.endswith('.ttf') # TODO
s = 'project.addAssets("' + path + '", { notinlist: ' + str(notinlist).lower() + ' '
@ -29,11 +40,14 @@ def add_assets(path, quality=1.0, use_data_dir=False, rel_path=False):
s += '});\n'
return s
def add_shaders(path, rel_path=False):
if rel_path:
path = os.path.relpath(path, arm.utils.get_fp())
def add_shaders(path: str, rel_path=False) -> str:
project_path = arm.utils.get_fp()
if rel_path and on_same_drive(path, project_path):
path = os.path.relpath(path, project_path)
return 'project.addShaders("' + path.replace('\\', '/').replace('//', '/') + '");\n'
def remove_readonly(func, path, excinfo):
os.chmod(path, stat.S_IWRITE)
func(path)