prepare glm 0.9.9 branch (#6338)

openframeworks · Jul 27, 2019 · 5fa86b5 · 5fa86b5
1 parent 9707492
commit 5fa86b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/libs/openFrameworks/3d/ofNode.cpp b/libs/openFrameworks/3d/ofNode.cpp
@@ -442,7 +442,7 @@ void ofNode::lookAt(const glm::vec3& lookAtPosition, glm::vec3 upVector) {
 	if (glm::length(zaxis) > 0) {
 		auto xaxis = glm::normalize(glm::cross(upVector, zaxis));
 		auto yaxis = glm::cross(zaxis, xaxis);
-		glm::mat3 m(glm::uninitialize);
+		glm::mat3 m;
 		m[0] = xaxis;
 		m[1] = yaxis;
 		m[2] = zaxis;

diff --git a/libs/openFrameworks/types/ofRectangle.h b/libs/openFrameworks/types/ofRectangle.h
@@ -3,6 +3,7 @@
 
 #include "ofConstants.h"
 #include <glm/vec3.hpp>
+#include <glm/vec2.hpp>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,6 +3,7 @@

		#include "ofConstants.h"
		#include <glm/vec3.hpp>
		#include <glm/vec2.hpp>



Expand Down