Merge branch 'development'

# Conflicts: # Source/RiveEditor/Private/RiveFileAssetTypeActions.cpp # Source/RiveEditor/Private/RiveTextureObjectAssetTypeActions.cpp
rive-app · Jul 2, 2024 · 36a3002 · 36a3002
2 parents 7434601 + ef3da5a
commit 36a3002
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Source/RiveEditor/Private/RiveFileAssetTypeActions.cpp b/Source/RiveEditor/Private/RiveFileAssetTypeActions.cpp
@@ -52,3 +52,5 @@ uint32 FRiveFileAssetTypeActions::GetCategories()
 {
 	return AssetCategory;
 }
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RiveEditor/Private/RiveTextureObjectAssetTypeActions.cpp b/Source/RiveEditor/Private/RiveTextureObjectAssetTypeActions.cpp
@@ -54,3 +54,5 @@ uint32 FRiveTextureObjectAssetTypeActions::GetCategories()
 {
 	return AssetCategory;
 }
+
+#undef LOCTEXT_NAMESPACE