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

Fix emission declaration

Browse source
This commit is contained in:
luboslenco 2019-02-11 16:10:37 +01:00
parent 92fa1b4fb3
commit 7f6b640dfe
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
blender/arm/material/make_decal.py
View file

@ -1,3 +1,4 @@
import bpy
import arm.material.cycles as cycles
import arm.material.mat_state as mat_state
import arm.material.mat_utils as mat_utils
@ -5,6 +6,7 @@ import arm.material.make_finalize as make_finalize
import arm.utils
def make(context_id):
wrd = bpy.data.worlds['Arm']
vs = [{'name': 'pos', 'data': 'float3'}]
con_decal = mat_state.data.add_context({ 'name': context_id, 'vertex_elements': vs, 'depth_write': False, 'compare_mode': 'less', 'cull_mode': 'clockwise',
@ -59,6 +61,8 @@ def make(context_id):
frag.write('float occlusion;')
frag.write('float specular;')
frag.write('float opacity;')
if '_Emission' in wrd.world_defs:
frag.write('float emission;')
cycles.parse(mat_state.nodes, con_decal, vert, frag, geom, tesc, tese)
frag.write('n /= (abs(n.x) + abs(n.y) + abs(n.z));')

2
blender/arm/material/make_voxel.py
View file

@ -59,6 +59,8 @@ def make_gi(context_id):
frag.write('float metallic;') #
frag.write('float occlusion;') #
frag.write('float specular;') #
if '_Emission' in wrd.world_defs:
frag.write('float emission;') #
frag.write('float dotNV = 0.0;')
cycles.parse(mat_state.nodes, con_voxel, vert, frag, geom, tesc, tese, parse_opacity=False, parse_displacement=False, basecol_only=True)