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

Linux fixes.

Browse source
This commit is contained in:
Lubos 2016-11-25 20:52:25 +01:00
parent 1609f50732
commit 9e772bbca3
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
blender/gen_renderpath.py
View file

@ -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):

4
blender/make.py
View file

@ -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()