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

Merge branch 'master' of https://github.com/armory3d/armory

Browse source
This commit is contained in:
Lubos Lenco 2017-11-29 11:19:42 +01:00
parent 6b60028409 e4e7dea445
commit 7612cb7d22
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
blender/arm/make.py
View file

@ -52,7 +52,7 @@ def export_data(fp, sdk_path, is_play=False, is_publish=False, in_viewport=False
global exporter
wrd = bpy.data.worlds['Arm']
print('\nArmory v' + wrd.arm_version)
print('\nArmory v{0} ({1})'.format(wrd.arm_version, wrd.arm_commit))
print('OS: ' + arm.utils.get_os() + ', Target: ' + state.target + ', GAPI: ' + arm.utils.get_gapi())
# Clean compiled variants if cache is disabled
@ -233,6 +233,11 @@ def compile_project(target_name=None, watch=False, patch=False, no_project_file=
cmd.append('-g')
cmd.append(arm.utils.get_gapi())
# Kha defaults to 110
if arm.utils.get_os() == 'linux' and (kha_target_name == 'krom' or kha_target_name == '') and state.in_viewport == False:
cmd.append('--shaderversion')
cmd.append('330')
cmd.append('--to')
if (kha_target_name == 'krom' and not state.in_viewport) or (kha_target_name == 'html5' and not state.is_publish):
cmd.append(arm.utils.build_dir() + '/debug')