Browse Source

Allow using `MeshLibrary.get_item_preview()` in non-editor builds again

This closes #36268.

(cherry picked from commit 64fac9dd5d8ad360c783020a62a04c8434f5e143)
Hugo Locurcio 5 years ago
parent
commit
b80190721b
2 changed files with 1 additions and 8 deletions
  1. 1 2
      doc/classes/MeshLibrary.xml
  2. 0 6
      scene/resources/mesh_library.cpp

+ 1 - 2
doc/classes/MeshLibrary.xml

@@ -84,8 +84,7 @@
 			<argument index="0" name="id" type="int">
 			<argument index="0" name="id" type="int">
 			</argument>
 			</argument>
 			<description>
 			<description>
-				Returns a generated item preview (a 3D rendering in isometric perspective).
-				[b]Note:[/b] Since item previews are only generated in an editor context, this function will return an empty [Texture] in a running project.
+				When running in the editor, returns a generated item preview (a 3D rendering in isometric perspective). When used in a running project, returns the manually-defined item preview which can be set using [method set_item_preview]. Returns an empty [Texture] if no preview was manually set in a running project.
 			</description>
 			</description>
 		</method>
 		</method>
 		<method name="get_item_shapes" qualifiers="const">
 		<method name="get_item_shapes" qualifiers="const">

+ 0 - 6
scene/resources/mesh_library.cpp

@@ -29,7 +29,6 @@
 /*************************************************************************/
 /*************************************************************************/
 
 
 #include "mesh_library.h"
 #include "mesh_library.h"
-#include "core/engine.h"
 
 
 bool MeshLibrary::_set(const StringName &p_name, const Variant &p_value) {
 bool MeshLibrary::_set(const StringName &p_name, const Variant &p_value) {
 
 
@@ -202,11 +201,6 @@ Transform MeshLibrary::get_item_navmesh_transform(int p_item) const {
 
 
 Ref<Texture> MeshLibrary::get_item_preview(int p_item) const {
 Ref<Texture> MeshLibrary::get_item_preview(int p_item) const {
 
 
-	if (!Engine::get_singleton()->is_editor_hint()) {
-		ERR_PRINT("MeshLibrary item previews are only generated in an editor context, which means they aren't available in a running project.");
-		return Ref<Texture>();
-	}
-
 	ERR_FAIL_COND_V_MSG(!item_map.has(p_item), Ref<Texture>(), "Requested for nonexistent MeshLibrary item '" + itos(p_item) + "'.");
 	ERR_FAIL_COND_V_MSG(!item_map.has(p_item), Ref<Texture>(), "Requested for nonexistent MeshLibrary item '" + itos(p_item) + "'.");
 	return item_map[p_item].preview;
 	return item_map[p_item].preview;
 }
 }