diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-05 22:41:45 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-05 22:41:45 +0400 |
commit | c97983c9dea72737ad29b6ee3a71726e4a8a11e7 (patch) | |
tree | 31d0d5c3a20e27a395be72a6f2f030e2ba4c6ffa | |
parent | 02fd2d256ddfbe12b6800eecab9b4223ade422fc (diff) |
correction for uv template, also some doxygen comment corrections.
-rw-r--r-- | release/scripts/templates_py/operator_uv.py | 1 | ||||
-rw-r--r-- | source/blender/blenlib/intern/string.c | 2 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_InputSocket.h | 1 | ||||
-rw-r--r-- | source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h | 2 | ||||
-rw-r--r-- | source/blender/nodes/NOD_static_types.h | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/templates_py/operator_uv.py b/release/scripts/templates_py/operator_uv.py index 4d25b7af37e..96e624bc30d 100644 --- a/release/scripts/templates_py/operator_uv.py +++ b/release/scripts/templates_py/operator_uv.py @@ -8,6 +8,7 @@ def main(context): bm = bmesh.from_edit_mesh(me) uv_layer = bm.loops.layers.uv.verify() + bm.faces.layers.tex.verify() # currently blender needs both layers. # adjust UVs for f in bm.faces: diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c index ba914944733..0982670eb5a 100644 --- a/source/blender/blenlib/intern/string.c +++ b/source/blender/blenlib/intern/string.c @@ -542,7 +542,7 @@ void BLI_ascii_strtoupper(char *str, const size_t len) * 2.0010 -> 2.001 * * \param str - * \param len + * \param pad * \return The number of zeto's stripped. */ int BLI_str_rstrip_float_zero(char *str, const char pad) diff --git a/source/blender/compositor/intern/COM_InputSocket.h b/source/blender/compositor/intern/COM_InputSocket.h index 5a36fe3f33b..23490b66bba 100644 --- a/source/blender/compositor/intern/COM_InputSocket.h +++ b/source/blender/compositor/intern/COM_InputSocket.h @@ -101,7 +101,6 @@ public: /** * @brief move all connections of this input socket to another socket * @param relinkToSocket the socket to move to connections to - * @param autoconnect will a set operation be added when no connections exist * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection) * @param system ExecutionSystem to update to */ diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h index 3cb8e11491e..bd2b28059d8 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h @@ -106,7 +106,7 @@ protected: * (Moves the vertices to make the stroke smoother). * Uses curvature flow to converge towards a curve of constant curvature. The diffusion method we use is anisotropic * to prevent the diffusion accross corners. - * @see \htmlonly <a href=/smoothing/smoothing.html>smoothing/smoothing.html</a> endhtmlonly + * @see \htmlonly <a href=/smoothing/smoothing.html>smoothing/smoothing.html</a> \endhtmlonly */ class LIB_STROKE_EXPORT SmoothingShader : public StrokeShader { diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index 811cd3f3b4a..4a45f98f7c9 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -20,7 +20,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/makesrna/intern/NOD_static_types.h +/** \file NOD_static_types.h * \ingroup nodes */ |