diff --git a/Assets/blend/Libraries/paint/blender.py b/Assets/blend/Libraries/paint/blender.py index b6ded852..b156502c 100644 --- a/Assets/blend/Libraries/paint/blender.py +++ b/Assets/blend/Libraries/paint/blender.py @@ -1,30 +1,23 @@ import bpy -import arm.material.mat_utils -import arm.write_data import arm.assets import arm.make_renderpath -import arm.make_state import arm.utils def on_make_world(): wrd = bpy.data.worlds['Arm'] wrd.world_defs += '_EnvTex' wrd.world_defs += '_EnvStr' + wrd.world_defs += '_CGrainStatic' + wrd.world_defs += '_Emission' + wrd.world_defs += '_Brdf' + wrd.world_defs += '_Irr' + wrd.world_defs += '_Rad' def on_make_renderpath(): wrd = bpy.data.worlds['Arm'] arm.assets.add_shader_pass('copy_mrt3_pass') arm.assets.add(arm.utils.get_sdk_path() + '/armory/Assets/noise256.png') arm.assets.add_embedded_data('noise256.png') - wrd.world_defs += '_CGrainStatic' - wrd.world_defs += '_Emission' - arm.assets.add_khafile_param('--macro include("arm.brushnode")') - # arm.assets.add_khafile_param('--macro include("armory.logicnode")') - arm.assets.add_khafile_def('arm_appwh') - arm.assets.add_khafile_def('arm_skip_envmap') - wrd.world_defs += '_Brdf' - wrd.world_defs += '_Irr' - wrd.world_defs += '_Rad' wrd.arm_envtex_num_mips = 10 wrd.arm_envtex_name = 'World.hdr' wrd.arm_envtex_irr_name = 'World' diff --git a/Assets/blend/scene.blend b/Assets/blend/scene.blend index df0f2b9d..746c8ead 100644 Binary files a/Assets/blend/scene.blend and b/Assets/blend/scene.blend differ diff --git a/Sources/Main.hx b/Sources/Main.hx index 1f649f49..b843b8a3 100644 --- a/Sources/Main.hx +++ b/Sources/Main.hx @@ -18,5 +18,6 @@ class Main { true, arm.renderpath.RenderPathCreator.get ); + new arm.App(); } } diff --git a/compiled/Assets/Scene.arm b/compiled/Assets/Scene.arm index 28a0591d..3ce8de16 100644 Binary files a/compiled/Assets/Scene.arm and b/compiled/Assets/Scene.arm differ