From 9e772bbca36c225c3b9028a74e903c7659043ba6 Mon Sep 17 00:00:00 2001 From: Lubos Date: Fri, 25 Nov 2016 20:52:25 +0100 Subject: [PATCH] Linux fixes. --- blender/gen_renderpath.py | 32 ++++++++++++++++---------------- blender/make.py | 4 +++- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/blender/gen_renderpath.py b/blender/gen_renderpath.py index 2bb21654..3565a77b 100644 --- a/blender/gen_renderpath.py +++ b/blender/gen_renderpath.py @@ -50,23 +50,23 @@ class GenRPDataPropsPanel(bpy.types.Panel): return if obj.type == 'CAMERA': - layout.prop(obj.data, "rp_renderer") - layout.prop(obj.data, "rp_supersampling") - layout.prop(obj.data, "rp_antialiasing") - layout.prop(obj.data, "rp_shadowmap") - layout.prop(obj.data, "rp_hdr") - layout.prop(obj.data, "rp_worldnodes") - layout.prop(obj.data, "rp_compositornodes") - layout.prop(obj.data, "rp_volumetriclight") - layout.prop(obj.data, "rp_ssao") - layout.prop(obj.data, "rp_ssr") - layout.prop(obj.data, "rp_bloom") - layout.prop(obj.data, "rp_motionblur") - layout.prop(obj.data, "rp_translucency") - layout.prop(obj.data, "rp_decals") - layout.prop(obj.data, "rp_overlays") + # layout.prop(obj.data, "rp_renderer") + # layout.prop(obj.data, "rp_supersampling") + # layout.prop(obj.data, "rp_antialiasing") + # layout.prop(obj.data, "rp_shadowmap") + # layout.prop(obj.data, "rp_hdr") + # layout.prop(obj.data, "rp_worldnodes") + # layout.prop(obj.data, "rp_compositornodes") + # layout.prop(obj.data, "rp_volumetriclight") + # layout.prop(obj.data, "rp_ssao") + # layout.prop(obj.data, "rp_ssr") + # layout.prop(obj.data, "rp_bloom") + # layout.prop(obj.data, "rp_motionblur") + # layout.prop(obj.data, "rp_translucency") + # layout.prop(obj.data, "rp_decals") + # layout.prop(obj.data, "rp_overlays") - layout.operator("arm.gen_renderpath") + # layout.operator("arm.gen_renderpath") layout.operator("arm.reimport_paths_menu") class EffectsRPDataPropsPanel(bpy.types.Panel): diff --git a/blender/make.py b/blender/make.py index 4374fdf8..83a998d0 100755 --- a/blender/make.py +++ b/blender/make.py @@ -387,7 +387,9 @@ def on_compiled(mode): # build, play, play_viewport, publish elif armutils.get_os() == 'mac': krom_path = sdk_path + '/Kode Studio.app/Contents/Resources/app/extensions/krom/Krom/macos/Krom.app/Contents/MacOS/Krom' else: - krom_path = sdk_path + '/linux64/resources/app/extensions/krom/Krom/linux/Krom' + krom_location = sdk_path + '/linux64/resources/app/extensions/krom/Krom/linux' + krom_path = krom_location + '/Krom' + os.chdir(krom_location) state.playproc = subprocess.Popen([krom_path, armutils.get_fp() + '/build/window/krom', armutils.get_fp() + '/build/window/krom-resources'], stderr=subprocess.PIPE) watch_play()