Explorar o código

Merge pull request #18708 from munrocket/dev

Merging so the Travis builds no longer fail.
Michael Herzog %!s(int64=5) %!d(string=hai) anos
pai
achega
83487e5887

BIN=BIN
examples/screenshots/misc_controls_drag.png


BIN=BIN
examples/screenshots/webgl_lightshafts.png


+ 0 - 0
examples/screenshots/webgl_materials_reflectivity.png → examples/screenshots/webgl_materials_physical_reflectivity.png


+ 1 - 0
examples/webgl_lightshafts.html

@@ -153,6 +153,7 @@
 
 							child.material.transparent = false;
 							child.material.alphaTest = 0.5;
+							child.material.depthWrite = true;
 
 						}