correction for uv template, also some doxygen comment corrections.

diff --git a/release/scripts/templates_py/operator_uv.py b/release/scripts/templates_py/operator_uv.py
index 4d25b7af37e98b169374b006921565d003ca8851..96e624bc30d01f21a54b6e3d26f9014b37bc7096 100644 (file)
--- 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 ba9149447336f46c4284f8e8c7e3fe39b44e8b71..0982670eb5aca7bf04b49c506cbf0b36c7d9845b 100644 (file)
--- 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 5a36fe3f33b4e360c0b91587c3e02366e03f0be2..23490b66bbad1f6f23c7ce8f079a22b3d131d685 100644 (file)
--- 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 3cb8e11491e31c74eca33b64a0343d266b222e31..bd2b28059d8618de62fd72b49c12749824846340 100644 (file)
--- 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 811cd3f3b4a9d7b3af703c57aeda499ff7adb923..4a45f98f7c93570aaf1a1f69e8e4420dfe8ad8e1 100644 (file)
--- 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
  */