Merge pull request #29783 from Faless/js/fix_build

Fix HTML5 build failed due to undefined symbol
This commit is contained in:
Fabio Alessandrelli 2019-06-15 05:05:21 +01:00 committed by GitHub
commit 7e108da078
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4688,6 +4688,7 @@ void RasterizerStorageGLES2::_render_target_allocate(RenderTarget *rt) {
/* BACK FBO */
/* For MSAA */
#ifndef JAVASCRIPT_ENABLED
if (rt->msaa != VS::VIEWPORT_MSAA_DISABLED && config.multisample_supported) {
rt->multisample_active = true;
@ -4743,7 +4744,9 @@ void RasterizerStorageGLES2::_render_target_allocate(RenderTarget *rt) {
glBindRenderbuffer(GL_RENDERBUFFER, 0);
} else {
} else
#endif
{
rt->multisample_active = false;
}