Skip to content

Commit

Permalink
Merge pull request #54735 from LightningAA/remove-camera-texture-flags
Browse files Browse the repository at this point in the history
Remove redundant texture flag setters/getters for `CameraTexture`
  • Loading branch information
akien-mga authored Nov 7, 2021
2 parents 79f2333 + d3c3540 commit ce634e0
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
9 changes: 0 additions & 9 deletions scene/resources/texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2871,15 +2871,6 @@ RID CameraTexture::get_rid() const {
}
}

void CameraTexture::set_flags(uint32_t p_flags) {
// not supported
}

uint32_t CameraTexture::get_flags() const {
// not supported
return 0;
}

Ref<Image> CameraTexture::get_image() const {
// not (yet) supported
return Ref<Image>();
Expand Down
3 changes: 0 additions & 3 deletions scene/resources/texture.h
Original file line number Diff line number Diff line change
Expand Up @@ -900,9 +900,6 @@ class CameraTexture : public Texture2D {
virtual RID get_rid() const override;
virtual bool has_alpha() const override;

virtual void set_flags(uint32_t p_flags);
virtual uint32_t get_flags() const;

virtual Ref<Image> get_image() const override;

void set_camera_feed_id(int p_new_id);
Expand Down

0 comments on commit ce634e0

Please sign in to comment.