Resolve conflicts with master

[irrlicht.git] / include / IVideoDriver.h

diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h
index 9bf7afd83778bda10fb504843bab6a9ffc361398..f93d761261ef53f1b58cd04ea3b09029e4b8cd89 100644 (file)
--- a/include/IVideoDriver.h
+++ b/include/IVideoDriver.h
@@ -747,7 +747,7 @@ namespace video
                \param texture Texture to be drawn.\r
                \param destPos Upper left 2d destination position where the\r
                image will be drawn.\r
-               \param sourceRect Source rectangle in the image.\r
+               \param sourceRect Source rectangle in the texture (based on it's OriginalSize)\r
                \param clipRect Pointer to rectangle on the screen where the\r
                image is clipped to.\r
                If this pointer is NULL the image is not clipped.\r
@@ -768,7 +768,7 @@ namespace video
                \param texture Texture to be drawn.\r
                \param positions Array of upper left 2d destinations where the\r
                images will be drawn.\r
-               \param sourceRects Source rectangles of the image.\r
+               \param sourceRects Source rectangles of the texture (based on it's OriginalSize)\r
                \param clipRect Pointer to rectangle on the screen where the\r
                images are clipped to.\r
                If this pointer is 0 then the image is not clipped.\r
@@ -788,7 +788,7 @@ namespace video
                /** Suggested and first implemented by zola.\r
                \param texture The texture to draw from\r
                \param destRect The rectangle to draw into\r
-               \param sourceRect The rectangle denoting a part of the texture\r
+               \param sourceRect The rectangle denoting a part of the texture (based on it's OriginalSize)\r
                \param clipRect Clips the destination rectangle (may be 0)\r
                \param colors Array of 4 colors denoting the color values of\r
                the corners of the destRect\r
@@ -1160,7 +1160,7 @@ namespace video
                E_MATERIAL_TYPE enum or a value which was returned by\r
                addMaterialRenderer().\r
                \param name: New name of the material renderer. */\r
-               virtual void setMaterialRendererName(s32 idx, const c8* name) =0;\r
+               virtual void setMaterialRendererName(u32 idx, const c8* name) =0;\r
 \r
                //! Swap the material renderers used for certain id's\r
                /** Swap the IMaterialRenderers responsible for rendering specific\r