Merge branch 'master' of github.com:nem0/LumixEngine
This commit is contained in:
commit
1afd78bd95
2 changed files with 4 additions and 1 deletions
|
@ -140,8 +140,9 @@ void EditorIcon::render(PipelineInstance& pipeline)
|
||||||
static const float MAX_SCALE_FACTOR = 60;
|
static const float MAX_SCALE_FACTOR = 60;
|
||||||
if (m_is_visible)
|
if (m_is_visible)
|
||||||
{
|
{
|
||||||
const Universe& universe = m_scene->getUniverse();
|
|
||||||
ComponentIndex camera = m_scene->getCameraInSlot("editor");
|
ComponentIndex camera = m_scene->getCameraInSlot("editor");
|
||||||
|
if (camera < 0) return;
|
||||||
|
const Universe& universe = m_scene->getUniverse();
|
||||||
Lumix::Matrix mtx = universe.getMatrix(m_scene->getCameraEntity(camera));
|
Lumix::Matrix mtx = universe.getMatrix(m_scene->getCameraEntity(camera));
|
||||||
|
|
||||||
float fov = m_scene->getCameraFOV(camera);
|
float fov = m_scene->getCameraFOV(camera);
|
||||||
|
|
|
@ -849,6 +849,8 @@ struct PipelineInstanceImpl : public PipelineInstance
|
||||||
int framebuffers_count,
|
int framebuffers_count,
|
||||||
int64 layer_mask)
|
int64 layer_mask)
|
||||||
{
|
{
|
||||||
|
if (camera < 0) return;
|
||||||
|
|
||||||
Universe& universe = m_scene->getUniverse();
|
Universe& universe = m_scene->getUniverse();
|
||||||
Entity camera_entity = m_scene->getCameraEntity(camera);
|
Entity camera_entity = m_scene->getCameraEntity(camera);
|
||||||
Vec3 camera_pos = universe.getPosition(camera_entity);
|
Vec3 camera_pos = universe.getPosition(camera_entity);
|
||||||
|
|
Loading…
Reference in a new issue