Merge branch 'main' into newMain
This commit is contained in:
+5
-1
@@ -59,7 +59,9 @@ export var Shader = GObject.registerClass({
|
||||
'end-animation': {}
|
||||
}
|
||||
},
|
||||
|
||||
class Shader extends Shell.GLSLEffect {
|
||||
|
||||
// --------------------------------------------
|
||||
// The constructor automagically loads the shader's source code (in
|
||||
// vfunc_build_pipeline()) from the resource file resources/shaders/<nick>.glsl
|
||||
@@ -207,4 +209,6 @@ export var Shader = GObject.registerClass({
|
||||
// Add a trailing newline. Else the GLSL compiler complains...
|
||||
return common + '\n' + code + '\n';
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user