Merge blends

.gitignore

@@ -1,4 +1,5 @@
 armorpaint.blend1
+grid.blend1
 build_armorpaint/
 khafile.js
 Sources/Main.hx

Libraries/paint/blender.py

@@ -1,3 +1,4 @@
+import bpy
 import arm.material.mat_utils
 import arm.write_data
 import arm.assets
@@ -10,11 +11,11 @@ def on_make_renderpath():
 
 def register():
 
-	#if no paint
-	# arm.material.mat_utils.add_mesh_contexts.append('voxel') # Defaults to make_ao
-	# arm.write_data.add_compiledglsl = """
-		# const ivec3 voxelgiResolution = ivec3(256, 256, 256);
-		# const vec3 voxelgiHalfExtents = vec3(2.0, 2.0, 2.0);
-	# """
+	if bpy.data.worlds['Arm'].arm_project_name == 'ArmorPaint':
+		arm.material.mat_utils.add_mesh_contexts.append('voxel') # Defaults to make_ao
+		arm.write_data.add_compiledglsl = """
+			const ivec3 voxelgiResolution = ivec3(256, 256, 256);
+			const vec3 voxelgiHalfExtents = vec3(2.0, 2.0, 2.0);
+		"""
 
 	arm.make_renderpath.callback = on_make_renderpath

Sources/arm/UITrait.hx

@@ -520,17 +520,19 @@ class UITrait extends iron.Trait {
 			// var mat:armory.data.MaterialData = cast(pui, armory.object.MeshObject).materials[0];
 			// mat.contexts[0].textures[0] = rt; // Override diffuse texture
 
+			#if arm_editor
 			grid = iron.Scene.active.getChild(".Grid");
 			gizmo = iron.Scene.active.getChild(".GizmoTranslate");
 			gizmoX = iron.Scene.active.getChild("GizmoX");
 			gizmoY = iron.Scene.active.getChild("GizmoY");
 			gizmoZ = iron.Scene.active.getChild("GizmoZ");
-			selectedObject = iron.Scene.active.getChild("Cube");
-			paintObject = selectedObject;
 			var lamp = iron.Scene.active.getChild("Lamp");
 			lamp.addTrait(new armory.trait.physics.RigidBody(0.0));
+			#end
 
-			currentObject = cast(iron.Scene.active.getChild("Cube"), MeshObject);
+			selectedObject = iron.Scene.active.getChild("Cube");
+			paintObject = selectedObject;
+			currentObject = cast(selectedObject, MeshObject);
 
 			iron.App.notifyOnUpdate(update);
 			iron.App.notifyOnRender2D(render);
@@ -1931,7 +1933,7 @@ class UITrait extends iron.Trait {
 					Krom.fileSaveBytes("data/config.arm", haxe.io.Bytes.ofString(haxe.Json.stringify(armory.data.Config.raw)).getData());
 					#end
 				}
-				ui.text("v0.4 armorpaint.org");
+				ui.text("v0.5 armorpaint.org");
 
 				if (ui.panel(Id.handle({selected: true}), "Console")) {
 					ui.text(lastTrace);