mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into issue/2645

Browse Source 
# Conflicts:
#	src/documentation/documentationengine.cpp
#	src/properties/propertyowner.cpp
#	src/scripting/scriptengine.cpp
#	src/util/factorymanager.cpp
This commit is contained in:
Ylva Selling
2024-03-25 11:14:09 +01:00
parent e25f3d34f7 cc76a5953f
commit b347659510
626 changed files with 12773 additions and 9245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openspace/properties/numericalproperty.inl
View File

@@ -110,7 +110,7 @@ void NumericalProperty<T>::setExponent(float exponent) {
if (!isValidRange(_minimumValue, _maximumValue)) {
LWARNINGC(
"NumericalProperty: setExponent",
fmt::format(
std::format(
"Setting exponent for properties with negative values in "
"[min, max] range is not yet supported. Property: {}",
this->fullyQualifiedIdentifier()

2
include/openspace/properties/selectionproperty.h
View File

@@ -122,7 +122,7 @@ protected:
private:
void sortOptions();
bool removeInvalidKeys(std::set<std::string>& keys);
bool removeInvalidKeys(std::set<std::string>& keys) const;
std::string generateAdditionalJsonDescription() const override;