Ghostkeeper 9ea418c0a1 Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"" ... This reverts commit 28f4d8513d. The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.		2020-08-20 16:35:52 +02:00
..
camera_distance.shader	Move multiplication from Python to shaders. (Needs the same-named Uranium branch.)	2019-04-19 16:58:38 +02:00
grid.shader	Move multiplication from Python to shaders. (Needs the same-named Uranium branch.)	2019-04-19 16:58:38 +02:00
overhang.shader	GL ES compatibility fixes.	2020-05-07 13:38:09 +01:00
striped.shader	Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7""	2020-08-20 16:35:52 +02:00
transparent_object.shader	Move multiplication from Python to shaders. (Needs the same-named Uranium branch.)	2019-04-19 16:58:38 +02:00
xray.shader	Fix legacy glsl shaders	2020-03-31 11:26:21 +02:00
xray_composite.shader	Fix x-ray error color.	2020-04-29 12:06:20 +02:00