From 0cc51b74a612bdeb9e5e98f85450edcf203997d2 Mon Sep 17 00:00:00 2001 From: cutealien Date: Mon, 31 Aug 2020 20:11:14 +0000 Subject: [PATCH] Merge branch releases/1.8 revisions r5898 through r6137 into trunk. Documentation fixes. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6138 dfc29bdd-3216-0410-991c-e03cc46cb475 --- include/IGUIStaticText.h | 4 ++-- include/IVideoDriver.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/IGUIStaticText.h b/include/IGUIStaticText.h index b55bd95d..beb8f597 100644 --- a/include/IGUIStaticText.h +++ b/include/IGUIStaticText.h @@ -85,8 +85,8 @@ namespace gui //! Sets text justification mode /** \param horizontal: EGUIA_UPPERLEFT for left justified (default), EGUIA_LOWEERRIGHT for right justified, or EGUIA_CENTER for centered text. - \param vertical: EGUIA_UPPERLEFT to align with top edge, - EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text (default). */ + \param vertical: EGUIA_UPPERLEFT to align with top edge (default), + EGUIA_LOWEERRIGHT for bottom edge, or EGUIA_CENTER for centered text. */ virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical) = 0; //! Enables or disables word wrap for using the static text as multiline text control. diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h index dea34a3a..ed8e57fc 100644 --- a/include/IVideoDriver.h +++ b/include/IVideoDriver.h @@ -382,7 +382,9 @@ namespace video \param format The color format of the render target. Floating point formats are supported. \return Pointer to the created texture or 0 if the texture could not be created. This pointer should not be dropped. See - IReferenceCounted::drop() for more information. */ + IReferenceCounted::drop() for more information. + You may want to remove it from driver texture cache with removeTexture if you no longer need it. + */ virtual ITexture* addRenderTargetTexture(const core::dimension2d& size, const io::path& name = "rt", const ECOLOR_FORMAT format = ECF_UNKNOWN) =0; @@ -1476,7 +1478,7 @@ namespace video other flags can be changed, though some might have to effect in most cases. Please note that you have to enable/disable this effect with - enableInitMaterial2D(). This effect is costly, as it increases + enableMaterial2D(). This effect is costly, as it increases the number of state changes considerably. Always reset the values when done. \return Material reference which should be altered to reflect