Merge branch 'patch-release'

openframeworks · May 10, 2018 · c274c7f · c274c7f
2 parents 68f3d88 + 7075418
commit c274c7f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/libs/openFrameworks/3d/ofNode.cpp b/libs/openFrameworks/3d/ofNode.cpp
@@ -235,7 +235,7 @@ void ofNode::setGlobalOrientation(const glm::quat& q) {
 		setOrientation(q);
 	} else {
 		auto invParent = glm::inverse(parent->getGlobalTransformMatrix());
-		auto m44 = q * glm::toQuat(invParent);
+		auto m44 = glm::toQuat(invParent) * q;
 		setOrientation(m44);
 	}
 }

diff --git a/libs/openFrameworks/graphics/ofTrueTypeFont.cpp b/libs/openFrameworks/graphics/ofTrueTypeFont.cpp
@@ -24,6 +24,7 @@ const ofUnicode::range ofUnicode::Space {32, 32};
 const ofUnicode::range ofUnicode::IdeographicSpace {0x3000, 0x3000};
 const ofUnicode::range ofUnicode::Latin {32, 0x007F};
 const ofUnicode::range ofUnicode::Latin1Supplement {32,0x00FF};
+const ofUnicode::range ofUnicode::LatinA {0x0100,0x017F};
 const ofUnicode::range ofUnicode::Greek {0x0370, 0x03FF};
 const ofUnicode::range ofUnicode::Cyrillic {0x0400, 0x04FF};
 const ofUnicode::range ofUnicode::Arabic {0x0600, 0x077F};
@@ -128,7 +129,9 @@ const std::initializer_list<ofUnicode::range> ofAlphabet::Devanagari {
 
 const std::initializer_list<ofUnicode::range> ofAlphabet::Latin {
 	ofUnicode::Latin1Supplement,
-	ofUnicode::LatinExtendedAdditional
+	ofUnicode::LatinExtendedAdditional,
+	ofUnicode::Latin,
+	ofUnicode::LatinA,
 };
 
 const std::initializer_list<ofUnicode::range> ofAlphabet::Greek {

diff --git a/libs/openFrameworks/graphics/ofTrueTypeFont.h b/libs/openFrameworks/graphics/ofTrueTypeFont.h
@@ -54,6 +54,7 @@ class ofUnicode{
 	static const range IdeographicSpace;
 	static const range Latin;
 	static const range Latin1Supplement;
+	static const range LatinA;
 	static const range Greek;
 	static const range Cyrillic;
 	static const range Arabic;

diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h
@@ -5,7 +5,7 @@
 #define OF_VERSION_MAJOR 0
 #define OF_VERSION_MINOR 11
 #define OF_VERSION_PATCH 0
-#define OF_VERSION_PRE_RELEASE "master"
+#define OF_VERSION_PRE_RELEASE "stable"
 
 // Set to 1 for compatibility with old projects using ofVec instead of glm
 #ifndef OF_USE_LEGACY_VECTOR_MATH