diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-17 12:53:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 12:53:48 +0200 |
| commit | c74bab66aaaef355ef8ac8d7e1a249509fad544e (patch) | |
| tree | acb761bb28562f1f40e0e5736a9c79e91b4b7fb1 /scene/resources | |
| parent | a1b4e4c607acb09c13bdf1b9609f2d45c4b01e15 (diff) | |
| parent | 072e379ffe7f0d8adc2ac0eb700abfd7c27d8278 (diff) | |
Merge pull request #11274 from Rubonnek/keep-argument-names-consistent
Renamed function arguments to keep them consistent between declaration and implementation
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/sky_box.cpp | 6 | ||||
| -rw-r--r-- | scene/resources/style_box.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scene/resources/sky_box.cpp b/scene/resources/sky_box.cpp index 9af8c42110..2ef20f67f5 100644 --- a/scene/resources/sky_box.cpp +++ b/scene/resources/sky_box.cpp @@ -419,10 +419,10 @@ void ProceduralSky::_queue_update() { call_deferred("_update_sky"); } -void ProceduralSky::_thread_done(const Ref<Image> &image) { +void ProceduralSky::_thread_done(const Ref<Image> &p_image) { - VS::get_singleton()->texture_allocate(texture, image->get_width(), image->get_height(), Image::FORMAT_RGBE9995, VS::TEXTURE_FLAG_FILTER | VS::TEXTURE_FLAG_REPEAT); - VS::get_singleton()->texture_set_data(texture, image); + VS::get_singleton()->texture_allocate(texture, p_image->get_width(), p_image->get_height(), Image::FORMAT_RGBE9995, VS::TEXTURE_FLAG_FILTER | VS::TEXTURE_FLAG_REPEAT); + VS::get_singleton()->texture_set_data(texture, p_image); _radiance_changed(); Thread::wait_to_finish(sky_thread); memdelete(sky_thread); diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h index 3d085f7166..4627c900ff 100644 --- a/scene/resources/style_box.h +++ b/scene/resources/style_box.h @@ -178,7 +178,7 @@ public: void set_border_width_all(int p_size); int get_border_width_min() const; - void set_border_width(Margin p_margin, int p_size); + void set_border_width(Margin p_margin, int p_width); int get_border_width(Margin p_margin) const; //blend @@ -214,7 +214,7 @@ public: int get_shadow_size() const; //ANTI_ALIASING - void set_anti_aliased(const bool &p_anit_aliasing); + void set_anti_aliased(const bool &p_anti_aliased); bool is_anti_aliased() const; //tempAA void set_aa_size(const int &p_aa_size); |