Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-03-13 18:15:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-03-13 18:15:37 +0300
commit585208e0e911c985a062dd74b6cc689e4fb63ef8 (patch)
treed390abe6663c5619d34dc929d68a24775d24d7fb /source/blender/blenkernel/BKE_node.h
parentc99c45a1e3563f4b6dad6eb9498a5ae0f386b93d (diff)
parentbe25a0faa7ff0f64e9d75f5f48c042bb8595f142 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
-rw-r--r--source/blender/blenkernel/BKE_node.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 73d3e30ee87..6427a87a182 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -575,7 +575,6 @@ void BKE_node_preview_set_pixel(struct bNodePreview *preview, const f
/** \} */
-
/* -------------------------------------------------------------------- */
/** \name Node Type Access
* \{ */
@@ -605,6 +604,7 @@ void node_type_gpu(struct bNodeType *ntype, NodeGPUExecFunction gpufu
void node_type_internal_links(struct bNodeType *ntype, void (*update_internal_links)(struct bNodeTree *, struct bNode *));
void node_type_compatibility(struct bNodeType *ntype, short compatibility);
+/** \} */
/* -------------------------------------------------------------------- */
/** \name Node Generic Functions
@@ -701,7 +701,7 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree, struct Scene *scene, c
/* -------------------------------------------------------------------- */
/** \name Shader Nodes
- */
+ * \{ */
struct ShadeInput;
struct ShadeResult;
@@ -827,7 +827,7 @@ void ntreeGPUMaterialDomain(struct bNodeTree *ntree, bool *has_surfac
/* -------------------------------------------------------------------- */
/** \name Composite Nodes
- */
+ * \{ */
/* output socket defines */
#define RRES_OUT_IMAGE 0
@@ -1011,7 +1011,7 @@ void ntreeCompositColorBalanceSyncFromCDL(bNodeTree *ntree, bNode *node);
/* -------------------------------------------------------------------- */
/** \name Texture Nodes
- */
+ * \{ */
struct TexResult;