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

Fix warning print

Browse source
This commit is contained in:
luboslenco 2018-03-06 22:05:36 +01:00
parent 5811569234
commit 97f3d3dd3b
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Sources/armory/trait/internal/DebugConsole.hx
View file

@ -60,7 +60,7 @@ class DebugConsole extends Trait {
static function consoleTrace(v:Dynamic, ?inf:haxe.PosInfos) {
lastTrace = Std.string(v);
haxeTrace(v, inf);
}
}
static var lrow = [1/2, 1/2];
function render2D(g:kha.graphics2.Graphics) {

3
blender/arm/material/mat_utils.py
View file

@ -15,7 +15,8 @@ def disp_linked(output_node):
if l.from_node.type == 'GROUP' and l.from_node.node_tree.name.startswith('Armory PBR') and \
((len(l.from_node.inputs) == 14 and l.from_node.inputs[10].is_linked == False) or (len(l.from_node.inputs) != 14 and l.from_node.inputs[7].is_linked == False)):
return False
if linked and not disp_enabled:
rpdat = arm.utils.get_rp()
if linked and not disp_enabled and rpdat.arm_displacement:
log.warn('Tessellation not available on ' + make_state.target)
return disp_enabled and linked

4
blender/arm/props_bake.py
View file

@ -1,9 +1,5 @@
import os
import shutil
import arm.assets as assets
import arm.utils
import bpy
import stat
from bpy.types import Menu, Panel, UIList
from bpy.props import *

3
blender/arm/props_ui.py
View file

@ -1201,7 +1201,8 @@ class ArmBakeButton(bpy.types.Operator):
for o in scn.arm_bakelist:
scn.objects[o.object_name].select = True
scn.objects.active = scn.objects[scn.arm_bakelist[0].object_name]
bpy.ops.object.bake(type='COMBINED')
# bpy.ops.uv.lightmap_pack("EXEC_SCREEN")
bpy.ops.object.bake('INVOKE_DEFAULT', type='COMBINED') # INVOKE_SCREEN
bpy.ops.object.select_all(action='DESELECT')
return{'FINISHED'}