From edd16295776ee8225b0a77ab5677ee6c93425169 Mon Sep 17 00:00:00 2001 From: Lubos Date: Wed, 29 Nov 2017 00:58:11 +0100 Subject: [PATCH 1/2] Print commit --- blender/arm/make.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blender/arm/make.py b/blender/arm/make.py index abd2578a..2547a3df 100755 --- a/blender/arm/make.py +++ b/blender/arm/make.py @@ -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 From e4e7dea4456fabcd15082ae54b49b776c53f62a0 Mon Sep 17 00:00:00 2001 From: Lubos Date: Wed, 29 Nov 2017 01:24:30 +0100 Subject: [PATCH 2/2] Bump linux glsl to 330 --- blender/arm/make.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/blender/arm/make.py b/blender/arm/make.py index 2547a3df..8f8a617e 100755 --- a/blender/arm/make.py +++ b/blender/arm/make.py @@ -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')