diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_object_deform.h | 2 | ||||
-rw-r--r-- | source/blender/bmesh/bmesh.h | 5 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 1 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.c | 3 | ||||
-rw-r--r-- | source/blender/compositor/COM_compositor.h | 3 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_ExecutionSystemHelper.h | 2 | ||||
-rw-r--r-- | source/blender/compositor/operations/COM_RenderLayersImageProg.h | 2 | ||||
-rw-r--r-- | source/blender/editors/io/io_collada.h | 2 | ||||
-rw-r--r-- | source/blender/editors/io/io_ops.h | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/imbuf_cocoa.m | 2 |
10 files changed, 17 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_object_deform.h b/source/blender/blenkernel/BKE_object_deform.h index 35a4e19a5bc..ecc521a77fb 100644 --- a/source/blender/blenkernel/BKE_object_deform.h +++ b/source/blender/blenkernel/BKE_object_deform.h @@ -23,7 +23,7 @@ #ifndef __BKE_OBJECT_DEFORM_H__ #define __BKE_OBJECT_DEFORM_H__ -/** \file BKE_object_vgroup.h +/** \file BKE_object_deform.h * \ingroup bke * \brief Functions for dealing with objects and deform verts, * used by painting and tools. diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index ac002070484..955b1a729c5 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -196,6 +196,11 @@ * * There may be a better place for this section, but adding here for now. * + * \subsection bm_todo_api API + * + * - make crease and bevel weight optional, they come for free in meshes but are allocated layers + * in the bmesh data structure. + * * * \subsection bm_todo_tools Tools * diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 94d94cbec3e..c449dec1b6c 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1483,6 +1483,7 @@ BMVert *bmesh_semv(BMesh *bm, BMVert *tv, BMEdge *e, BMEdge **r_e) * and collapses the edge on that vertex. * * \par Examples: + * * <pre> * Before: OE KE * ------- ------- diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index ade560edd49..23526d7498b 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -987,7 +987,8 @@ void bmo_subdivide_edges_exec(BMesh *bm, BMOperator *op) * and not try to be clever guessing which face to cut up. * * To avoid this case we need to check: - * Do the verts of each loop share a face (but not connect to make an edge of that face) + * Do the verts of each share a face besides the one we are subdividing, + * (but not connect to make an edge of that face). */ { BMLoop *other_loop; diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h index f8b5a16ec64..f35bf71392c 100644 --- a/source/blender/compositor/COM_compositor.h +++ b/source/blender/compositor/COM_compositor.h @@ -277,6 +277,9 @@ extern "C" { * It can be executed during editing (blenkernel/node.c) or rendering * (renderer/pipeline.c) * + * @param rd [struct RenderData] + * Render data for this composite, this won't always belong to a scene. + * * @param editingtree [struct bNodeTree] * reference to the compositor editing tree * diff --git a/source/blender/compositor/intern/COM_ExecutionSystemHelper.h b/source/blender/compositor/intern/COM_ExecutionSystemHelper.h index bd34fe8ab02..307e082ea80 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystemHelper.h +++ b/source/blender/compositor/intern/COM_ExecutionSystemHelper.h @@ -55,7 +55,7 @@ public: * this node is converted to a Node instance. * and the converted node is returned * - * @param bNode node to add + * @param b_node node to add * @return Node that represents the bNode or null when not able to convert. */ static Node *addNode(vector<Node *>& nodes, bNode *b_node, bool isInActiveGroup, bool fast); diff --git a/source/blender/compositor/operations/COM_RenderLayersImageProg.h b/source/blender/compositor/operations/COM_RenderLayersImageProg.h index 2d63bad235b..5fa74c8b21f 100644 --- a/source/blender/compositor/operations/COM_RenderLayersImageProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersImageProg.h @@ -25,7 +25,7 @@ #include "COM_RenderLayersBaseProg.h" -/// @TODO rename to image operation +/// @todo rename to image operation class RenderLayersColorProg : public RenderLayersBaseProg { public: RenderLayersColorProg(); diff --git a/source/blender/editors/io/io_collada.h b/source/blender/editors/io/io_collada.h index 5cb255e1b7c..4bb1475a3b2 100644 --- a/source/blender/editors/io/io_collada.h +++ b/source/blender/editors/io/io_collada.h @@ -24,7 +24,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/editor/io/io_collada.h +/** \file blender/editors/io/io_collada.h * \ingroup editor/io */ diff --git a/source/blender/editors/io/io_ops.h b/source/blender/editors/io/io_ops.h index 4c04b349655..4fffca4607c 100644 --- a/source/blender/editors/io/io_ops.h +++ b/source/blender/editors/io/io_ops.h @@ -24,7 +24,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/editor/io/io_ops.h +/** \file blender/editors/io/io_ops.h * \ingroup editor/io */ diff --git a/source/blender/imbuf/intern/imbuf_cocoa.m b/source/blender/imbuf/intern/imbuf_cocoa.m index 10381e9d1c3..d099c8af236 100644 --- a/source/blender/imbuf/intern/imbuf_cocoa.m +++ b/source/blender/imbuf/intern/imbuf_cocoa.m @@ -20,7 +20,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/imbuf/intern/imbuf_coca.m +/** \file blender/imbuf/intern/imbuf_cocoa.m * \ingroup imbuf * * Provides image file loading and saving for Blender, via Cocoa. |