diff options
| author | clayjohn <claynjohn@gmail.com> | 2019-06-02 15:09:02 -0700 |
|---|---|---|
| committer | clayjohn <claynjohn@gmail.com> | 2019-06-03 12:11:54 -0700 |
| commit | 2b8b1d7c4632e5a8b11b5dd6d974ec94ce211289 (patch) | |
| tree | b63ed486c4c017c0be7c8f975daea62cfcf8aa8f /drivers/gles3 | |
| parent | 85a338295859bd14817df675f9ce045f39658920 (diff) | |
added MultiMeshInstance2D node for using MultiMesh in 2D
Diffstat (limited to 'drivers/gles3')
| -rw-r--r-- | drivers/gles3/shaders/canvas.glsl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl index 0d1e7ee4a1..a46b31c92e 100644 --- a/drivers/gles3/shaders/canvas.glsl +++ b/drivers/gles3/shaders/canvas.glsl @@ -117,7 +117,12 @@ void main() { #ifdef USE_INSTANCING mat4 extra_matrix_instance = extra_matrix * transpose(mat4(instance_xform0, instance_xform1, instance_xform2, vec4(0.0, 0.0, 0.0, 1.0))); color *= instance_color; + +#ifdef USE_INSTANCE_CUSTOM vec4 instance_custom = instance_custom_data; +#else + vec4 instance_custom = vec4(0.0); +#endif #else mat4 extra_matrix_instance = extra_matrix; |