Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge branch 'master' of https://github.com/okamstudio/godot into fix_sprintf_errors

Bil Bas (Spooner) 10 years ago
parent
6353734bfb 3fdf3d8eab
commit
e3bf8ab02d
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      servers/visual/rasterizer_dummy.cpp
  2. 1 1
      servers/visual/rasterizer_dummy.h

+ 1 - 1
servers/visual/rasterizer_dummy.cpp
View File 

@@ -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) {
 
 
 
 }

+ 1 - 1
servers/visual/rasterizer_dummy.h
View File 

@@ -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 */