Merge branch 'wouter/text-component' into niels/UI

2 files changed, 3 insertions, 2 deletions

diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 668e5d1..a24e32e 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -156,6 +156,7 @@ private:
 	void subscribe_internal(const EventHandler<EventType> & callback, event_channel_t channel);
 
 protected:
+	OptionalRef<Mediator> mediator;
 	// NOTE: This must be the only constructor on Script, see "Late references" below
 	Script() = default;
 	//! Only \c BehaviorScript instantiates Script
@@ -190,7 +191,7 @@ private:
 	//! Reference to parent component
 	OptionalRef<bool> active;
 	//! Mediator reference
-	OptionalRef<Mediator> mediator;
+
 	//! \}
 
 private:
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index fbb1ad6..ec0bf74 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -53,7 +53,7 @@ public:
 	//! Label text.
 	std::string text = "";
 	//! Font asset variable
-	Asset font;
+	const Asset font;
 	//! Data instance
 	Data data;
 };