diff options
| author | Bil Bas (Spooner) <bil.bagpuss@gmail.com> | 2015-02-19 14:55:21 +0000 |
|---|---|---|
| committer | Bil Bas (Spooner) <bil.bagpuss@gmail.com> | 2015-02-19 14:55:21 +0000 |
| commit | e3bf8ab02da6a5d4f4d52aa3b1ac73df59f76282 (patch) | |
| tree | 15d7a4f4dc2ff52b4100bdb62c36a2caf35435f3 | |
| parent | 6353734bfb2dd2671d05de02eee928238425cf4a (diff) | |
| parent | 3fdf3d8eabf3ca8c756de52a4bb6aa302c1f454f (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot into fix_sprintf_errors
| -rw-r--r-- | servers/visual/rasterizer_dummy.cpp | 2 | ||||
| -rw-r--r-- | servers/visual/rasterizer_dummy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/visual/rasterizer_dummy.cpp b/servers/visual/rasterizer_dummy.cpp index 6c1b6697c1..7fb8eb02fc 100644 --- a/servers/visual/rasterizer_dummy.cpp +++ b/servers/visual/rasterizer_dummy.cpp @@ -1622,7 +1622,7 @@ void RasterizerDummy::canvas_set_transform(const Matrix32& p_transform) { } -void RasterizerDummy::canvas_render_items(CanvasItem *p_item_list) { +void RasterizerDummy::canvas_render_items(CanvasItem *p_item_list,int p_z,const Color& p_modulate,CanvasLight *p_light) { } diff --git a/servers/visual/rasterizer_dummy.h b/servers/visual/rasterizer_dummy.h index c72149f88f..baa48951d6 100644 --- a/servers/visual/rasterizer_dummy.h +++ b/servers/visual/rasterizer_dummy.h @@ -710,7 +710,7 @@ public: virtual void canvas_draw_polygon(int p_vertex_count, const int* p_indices, const Vector2* p_vertices, const Vector2* p_uvs, const Color* p_colors,const RID& p_texture,bool p_singlecolor); virtual void canvas_set_transform(const Matrix32& p_transform); - virtual void canvas_render_items(CanvasItem *p_item_list); + virtual void canvas_render_items(CanvasItem *p_item_list,int p_z,const Color& p_modulate,CanvasLight *p_light); /* ENVIRONMENT */ |