From 4f5a1bc340c5605bbe4dd02f51c14e03f419a6f5 Mon Sep 17 00:00:00 2001 From: David Back Date: Wed, 27 Jun 2018 19:02:55 -0700 Subject: [PATCH 1/2] zero out spread values for previous versions --- libraries/entities/src/EntityTree.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index a58f01a83b..87fcdc4f4d 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -2521,6 +2521,13 @@ bool EntityTree::readFromMap(QVariantMap& map) { } } + // Zero out the spread values that were fixed in version ParticleEntityFix so they behave the same as before + if (contentVersion < (int)EntityVersion::ParticleEntityFix) { + properties.setRadiusSpread(0.f); + properties.setAlphaSpread(0.f); + properties.setColorSpread({0, 0, 0}); + } + EntityItemPointer entity = addEntity(entityItemID, properties); if (!entity) { qCDebug(entities) << "adding Entity failed:" << entityItemID << properties.getType(); From a8e231c5afad7e4a3a2ffcdef9022de6e53299de Mon Sep 17 00:00:00 2001 From: David Back Date: Thu, 28 Jun 2018 11:33:38 -0700 Subject: [PATCH 2/2] floats .0f --- libraries/entities/src/EntityTree.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 87fcdc4f4d..0315ba7186 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -2523,8 +2523,8 @@ bool EntityTree::readFromMap(QVariantMap& map) { // Zero out the spread values that were fixed in version ParticleEntityFix so they behave the same as before if (contentVersion < (int)EntityVersion::ParticleEntityFix) { - properties.setRadiusSpread(0.f); - properties.setAlphaSpread(0.f); + properties.setRadiusSpread(0.0f); + properties.setAlphaSpread(0.0f); properties.setColorSpread({0, 0, 0}); }