Browse Source

Merge pull request #35476 from clayjohn/GLES3-scene-crash

Fix recently introduced crash in viewport size
Rémi Verschelde 5 years ago
parent
commit
1c0995d450
1 changed files with 5 additions and 5 deletions
  1. 5 5
      drivers/gles3/rasterizer_scene_gles3.cpp

+ 5 - 5
drivers/gles3/rasterizer_scene_gles3.cpp

@@ -4130,13 +4130,13 @@ void RasterizerSceneGLES3::render_scene(const Transform &p_cam_transform, const
 	state.ubo_data.shadow_dual_paraboloid_render_zfar = 0;
 	state.ubo_data.opaque_prepass_threshold = 0.99;
 
-	int viewport_width_pixels = storage->frame.current_rt->width;
-	int viewport_height_pixels = storage->frame.current_rt->height;
+	if (storage->frame.current_rt) {
+		int viewport_width_pixels = storage->frame.current_rt->width;
+		int viewport_height_pixels = storage->frame.current_rt->height;
 
-	state.ubo_data.viewport_size[0] = viewport_width_pixels;
-	state.ubo_data.viewport_size[1] = viewport_height_pixels;
+		state.ubo_data.viewport_size[0] = viewport_width_pixels;
+		state.ubo_data.viewport_size[1] = viewport_height_pixels;
 
-	if (storage->frame.current_rt) {
 		state.ubo_data.screen_pixel_size[0] = 1.0 / viewport_width_pixels;
 		state.ubo_data.screen_pixel_size[1] = 1.0 / viewport_height_pixels;
 	}