git-svn-id: svn://db.shs.com.ru/libs@65 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2015-12-09 15:44:03 +00:00
parent 64f21dc682
commit 458a516317
31 changed files with 1486 additions and 870 deletions

View File

@@ -400,7 +400,7 @@ GLObjectBase * loadFromDAEFile(const QString & filepath, double scale) {
for (int i = 0; i < root->childCount(); ++i) {
GLObjectBase * o = root->child(i);
if (o->type() == GLObjectBase::Light) {
if (o->type() == GLObjectBase::glLight) {
Light * l = (Light*)o;
if (l->light_type == Light::Directional || l->light_type == Light::Cone) {
QString tn = l->name() + ".Target";
@@ -423,6 +423,7 @@ GLObjectBase * loadFromDAEFile(const QString & filepath, double scale) {
for (int j = 0; j < dol[i].size(); ++j)
delete dol[i][j];
root->setScale(0.001);
qDebug() << "[Loader DAE] Loaded" << root->childCount() << "objects from" << filepath;
return root;
}