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

Merge pull request #2141 from MoritzBrueckner/instancing-fix

Browse source 
Fix writing to gl_Position before instancing code
This commit is contained in:
Lubos Lenco 2021-03-27 09:03:08 +01:00 committed by GitHub
parent 8118733474 24093d15df
commit 44f08a16ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
blender/arm/material/make_mesh.py
View file

@ -125,6 +125,10 @@ def make_base(con_mesh, parse_opacity):
if write_material_attribs_post != None:
write_material_attribs_post(con_mesh, frag)
vert.add_out('vec3 wnormal')
make_attrib.write_norpos(con_mesh, vert)
frag.write_attrib('vec3 n = normalize(wnormal);')
if not is_displacement and not vattr_written:
make_attrib.write_vertpos(vert)
@ -162,10 +166,6 @@ def make_base(con_mesh, parse_opacity):
make_tess.interpolate(tese, 'vcolor', 3, declare_out=frag.contains('vcolor'))
tese.write_pre = False
vert.add_out('vec3 wnormal')
make_attrib.write_norpos(con_mesh, vert)
frag.write_attrib('vec3 n = normalize(wnormal);')
if con_mesh.is_elem('tang'):
if tese is not None:
tese.add_out('mat3 TBN')