godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "Convert To ShaderMaterial" option not working, closes #20891

Browse Source
This commit is contained in:
JFonS 2018-08-26 12:25:41 +02:00
parent cef310e0ea
commit ee06cfe6e5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/plugins/material_editor_plugin.cpp
View File

@ -429,7 +429,7 @@ bool SpatialMaterialConversionPlugin::handles(const Ref<Resource> &p_resource) c
Ref<SpatialMaterial> mat = p_resource; Ref<SpatialMaterial> mat = p_resource;
return mat.is_valid(); return mat.is_valid();
} }
Ref<Resource> SpatialMaterialConversionPlugin::convert(const Ref<Resource> &p_resource) { Ref<Resource> SpatialMaterialConversionPlugin::convert(const Ref<Resource> &p_resource) const {
Ref<SpatialMaterial> mat = p_resource; Ref<SpatialMaterial> mat = p_resource;
ERR_FAIL_COND_V(!mat.is_valid(), Ref<Resource>()); ERR_FAIL_COND_V(!mat.is_valid(), Ref<Resource>());
@ -475,7 +475,7 @@ bool ParticlesMaterialConversionPlugin::handles(const Ref<Resource> &p_resource)
Ref<ParticlesMaterial> mat = p_resource; Ref<ParticlesMaterial> mat = p_resource;
return mat.is_valid(); return mat.is_valid();
} }
Ref<Resource> ParticlesMaterialConversionPlugin::convert(const Ref<Resource> &p_resource) { Ref<Resource> ParticlesMaterialConversionPlugin::convert(const Ref<Resource> &p_resource) const {
Ref<ParticlesMaterial> mat = p_resource; Ref<ParticlesMaterial> mat = p_resource;
ERR_FAIL_COND_V(!mat.is_valid(), Ref<Resource>()); ERR_FAIL_COND_V(!mat.is_valid(), Ref<Resource>());
@ -513,7 +513,7 @@ bool CanvasItemMaterialConversionPlugin::handles(const Ref<Resource> &p_resource
Ref<CanvasItemMaterial> mat = p_resource; Ref<CanvasItemMaterial> mat = p_resource;
return mat.is_valid(); return mat.is_valid();
} }
Ref<Resource> CanvasItemMaterialConversionPlugin::convert(const Ref<Resource> &p_resource) { Ref<Resource> CanvasItemMaterialConversionPlugin::convert(const Ref<Resource> &p_resource) const {
Ref<CanvasItemMaterial> mat = p_resource; Ref<CanvasItemMaterial> mat = p_resource;
ERR_FAIL_COND_V(!mat.is_valid(), Ref<Resource>()); ERR_FAIL_COND_V(!mat.is_valid(), Ref<Resource>());

6
editor/plugins/material_editor_plugin.h
View File

@ -109,7 +109,7 @@ class SpatialMaterialConversionPlugin : public EditorResourceConversionPlugin {
public: public:
virtual String converts_to() const; virtual String converts_to() const;
virtual bool handles(const Ref<Resource> &p_resource) const; virtual bool handles(const Ref<Resource> &p_resource) const;
virtual Ref<Resource> convert(const Ref<Resource> &p_resource); virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const;
}; };
class ParticlesMaterialConversionPlugin : public EditorResourceConversionPlugin { class ParticlesMaterialConversionPlugin : public EditorResourceConversionPlugin {
@ -117,7 +117,7 @@ class ParticlesMaterialConversionPlugin : public EditorResourceConversionPlugin
public: public:
virtual String converts_to() const; virtual String converts_to() const;
virtual bool handles(const Ref<Resource> &p_resource) const; virtual bool handles(const Ref<Resource> &p_resource) const;
virtual Ref<Resource> convert(const Ref<Resource> &p_resource); virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const;
}; };
class CanvasItemMaterialConversionPlugin : public EditorResourceConversionPlugin { class CanvasItemMaterialConversionPlugin : public EditorResourceConversionPlugin {
@ -125,7 +125,7 @@ class CanvasItemMaterialConversionPlugin : public EditorResourceConversionPlugin
public: public:
virtual String converts_to() const; virtual String converts_to() const;
virtual bool handles(const Ref<Resource> &p_resource) const; virtual bool handles(const Ref<Resource> &p_resource) const;
virtual Ref<Resource> convert(const Ref<Resource> &p_resource); virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const;
}; };
#endif // MATERIAL_EDITOR_PLUGIN_H #endif // MATERIAL_EDITOR_PLUGIN_H