From 3a92a70dea0e75800f2689f73244bf0ef5a21005 Mon Sep 17 00:00:00 2001 From: Mikulas Florek Date: Tue, 19 Apr 2016 10:25:24 +0200 Subject: [PATCH] missing ; --- src/editor/import_asset_dialog.cpp | 11 ++++++++++- src/renderer/render_scene.cpp | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/editor/import_asset_dialog.cpp b/src/editor/import_asset_dialog.cpp index 2c9238cab8..4b94032b28 100644 --- a/src/editor/import_asset_dialog.cpp +++ b/src/editor/import_asset_dialog.cpp @@ -1038,7 +1038,7 @@ struct ConvertTask : public Lumix::MT::Task { const aiBone* bone = mesh.mesh->mBones[j]; int bone_index = getNodeIndex(bone); - ASSERT(bone_index >= 0) + ASSERT(bone_index >= 0); for (unsigned int k = 0; k < bone->mNumWeights; ++k) { int idx = mesh.map_from_input[bone->mWeights[k].mVertexId]; @@ -2309,6 +2309,15 @@ void ImportAssetDialog::checkTask(bool wait) void ImportAssetDialog::onGUI() { + static bool once = false; + if (!once) + { + createBillboard(Lumix::Path("models/trees/pine1.msh"), Lumix::Path("a.tga"), m_editor.getEngine(), 256); + createBillboard(Lumix::Path("models/trees/pine3.msh"), Lumix::Path("b.tga"), m_editor.getEngine(), 256); + createBillboard(Lumix::Path("models/utils/cube/cube.msh"), Lumix::Path("c.tga"), m_editor.getEngine(), 256); + once = true; + } + if (ImGui::BeginDock("Import Asset", &m_is_opened)) { if (hasMessage()) diff --git a/src/renderer/render_scene.cpp b/src/renderer/render_scene.cpp index a207669107..a9f6ec4b9d 100644 --- a/src/renderer/render_scene.cpp +++ b/src/renderer/render_scene.cpp @@ -3203,7 +3203,7 @@ class RenderSceneImpl : public RenderScene model->getPose(*r.pose); } r.matrix = m_universe.getMatrix(r.entity); - ASSERT(!r.meshes || r.custom_meshes) + ASSERT(!r.meshes || r.custom_meshes); if (r.meshes) { allocateCustomMeshes(r, model->getMeshCount());