Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-23 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Null check the Prop2DCache sincgleton in Prop2DMesher's constructor.

Browse Source
This commit is contained in:
Relintai 2022-03-17 10:31:08 +01:00
parent 052027dce4
commit 5997c7dc4d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/props_2d/prop_2d_mesher.cpp
View File

@ -25,9 +25,9 @@ SOFTWARE.
#include "lights/prop_2d_light.h"
#include "modules/opensimplex/open_simplex_noise.h"
#include "./singleton/prop_2d_cache.h"
#include "material_cache/prop_2d_material_cache.h"
#include "tiled_wall/tiled_wall_2d_data.h"
#include "./singleton/prop_2d_cache.h"
const String Prop2DMesher::BINDING_STRING_BUILD_FLAGS = "Use Lighting,Use AO,Use RAO,Bake Lights";
@ -1123,7 +1123,14 @@ Prop2DMesher::Prop2DMesher() {
_uv_margin = Rect2(0, 0, 1, 1);
_format = 0;
_texture_scale = 1;
_pixels_per_unit = Prop2DCache::get_singleton()->get_default_pixels_per_unit();
if (Prop2DCache::get_singleton()) {
_pixels_per_unit = Prop2DCache::get_singleton()->get_default_pixels_per_unit();
} else {
//Just fall back to the default.
//Note that this will be removed when I get to it, as it can be calculated.
_pixels_per_unit = 64;
}
_build_flags = 0;