Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7066 from zzmp/fix/circle3d-radii

Browse source 
Add radius as property to circle3d
This commit is contained in:
Brad Hefta-Gaub 2016-02-11 13:07:24 -08:00
commit 894c75f8fc
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/ui/overlays/Circle3DOverlay.cpp
View file

@ -299,7 +299,10 @@ void Circle3DOverlay::setProperties(const QScriptValue &properties) {
setEndAt(endAt.toVariant().toFloat());
}
QScriptValue outerRadius = properties.property("outerRadius");
QScriptValue outerRadius = properties.property("radius");
if (!outerRadius.isValid()) {
outerRadius = properties.property("outerRadius");
}
if (outerRadius.isValid()) {
setOuterRadius(outerRadius.toVariant().toFloat());
}
@ -366,6 +369,9 @@ QScriptValue Circle3DOverlay::getProperty(const QString& property) {
if (property == "endAt") {
return _endAt;
}
if (property == "radius") {
return _outerRadius;
}
if (property == "outerRadius") {
return _outerRadius;
}