瀏覽代碼

Merge pull request #24169 from mrcdk/fix_canvasitem_draw_multimesh

Fixed CanvasItem.draw_multimesh() binding
Rémi Verschelde 6 年之前
父節點
當前提交
ad60ab9e3f
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      doc/classes/CanvasItem.xml
  2. 1 1
      scene/2d/canvas_item.cpp

+ 1 - 1
doc/classes/CanvasItem.xml

@@ -135,7 +135,7 @@
 		<method name="draw_multimesh">
 			<return type="void">
 			</return>
-			<argument index="0" name="mesh" type="Mesh">
+			<argument index="0" name="mesh" type="MultiMesh">
 			</argument>
 			<argument index="1" name="texture" type="Texture">
 			</argument>

+ 1 - 1
scene/2d/canvas_item.cpp

@@ -1160,7 +1160,7 @@ void CanvasItem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("draw_string", "font", "position", "text", "modulate", "clip_w"), &CanvasItem::draw_string, DEFVAL(Color(1, 1, 1)), DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("draw_char", "font", "position", "char", "next", "modulate"), &CanvasItem::draw_char, DEFVAL(Color(1, 1, 1)));
 	ClassDB::bind_method(D_METHOD("draw_mesh", "mesh", "texture", "normal_map"), &CanvasItem::draw_mesh, DEFVAL(Ref<Texture>()));
-	ClassDB::bind_method(D_METHOD("draw_multimesh", "mesh", "texture", "normal_map"), &CanvasItem::draw_mesh, DEFVAL(Ref<Texture>()));
+	ClassDB::bind_method(D_METHOD("draw_multimesh", "multimesh", "texture", "normal_map"), &CanvasItem::draw_multimesh, DEFVAL(Ref<Texture>()));
 
 	ClassDB::bind_method(D_METHOD("draw_set_transform", "position", "rotation", "scale"), &CanvasItem::draw_set_transform);
 	ClassDB::bind_method(D_METHOD("draw_set_transform_matrix", "xform"), &CanvasItem::draw_set_transform_matrix);