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

Merge pull request #2213 from MoritzBrueckner/fix-instancing-mobile

Browse source 
Fix instancing on mobile and solid renderpaths
This commit is contained in:
Lubos Lenco 2021-05-26 12:46:52 +02:00 committed by GitHub
parent 7b5294121d bdc2d91c1e
commit 138386f02a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -296,8 +296,6 @@ def make_forward_mobile(con_mesh):
vert.write_attrib('vec4 spos = vec4(pos.xyz, 1.0);')
frag.ins = vert.outs
make_attrib.write_vertpos(vert)
frag.add_include('compiled.inc')
frag.write('vec3 basecol;')
frag.write('float roughness;')
@ -344,6 +342,8 @@ def make_forward_mobile(con_mesh):
make_attrib.write_norpos(con_mesh, vert)
frag.write_attrib('vec3 n = normalize(wnormal);')
make_attrib.write_vertpos(vert)
frag.add_include('std/math.glsl')
frag.add_include('std/brdf.glsl')
@ -474,8 +474,6 @@ def make_forward_solid(con_mesh):
vert.write_attrib('vec4 spos = vec4(pos.xyz, 1.0);')
frag.ins = vert.outs
make_attrib.write_vertpos(vert)
frag.add_include('compiled.inc')
frag.write('vec3 basecol;')
frag.write('float roughness;')
@ -512,6 +510,7 @@ def make_forward_solid(con_mesh):
vert.write('vcolor = col.rgb;')
make_attrib.write_norpos(con_mesh, vert, write_nor=False)
make_attrib.write_vertpos(vert)
frag.add_out('vec4 fragColor')
if blend and parse_opacity: