diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
| commit | eacb8f04c4697b8123afeec03088eebb3c4b20bd (patch) | |
| tree | 8070f7807ec5d6a375df7184b151abbee8790608 /servers | |
| parent | a75f8963380a1f6ae8501f21a1d3f3bef8a89d91 (diff) | |
| parent | 4c4d79e3c98182faf348f41f98d1cc3e5d843e69 (diff) | |
| download | redot-engine-eacb8f04c4697b8123afeec03088eebb3c4b20bd.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/visual/visual_server_raster.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index cb9e96e284..5abad863ee 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -657,7 +657,7 @@ public: virtual RID texture_create(); virtual void texture_allocate(RID p_texture,int p_width, int p_height,Image::Format p_format,uint32_t p_flags=TEXTURE_FLAGS_DEFAULT); - virtual void texture_set_data(RID p_texture,const Image& p_image,CubeMapSide p_cube_side=CUBEMAP_LEFT); + virtual void texture_set_data(RID p_texture,const Image& p_image,CubeMapSide p_cube_side=CUBEMAP_LEFT); virtual Image texture_get_data(RID p_texture,CubeMapSide p_cube_side=CUBEMAP_LEFT) const; virtual void texture_set_flags(RID p_texture,uint32_t p_flags) ; virtual uint32_t texture_get_flags(RID p_texture) const; |