Merge branch 'master' into blender2.8
[blender.git] / source / blender / nodes / NOD_composite.h
index 4320e0436ced1ff9a791b023d8adcced97b97218..a5c2e604f46e9e557368206c7a52edd31b489307 100644 (file)
@@ -42,8 +42,6 @@ extern struct bNodeTreeType *ntreeType_Composite;
 void register_node_tree_type_cmp(void);
 
 void register_node_type_cmp_group(void);
-void register_node_type_cmp_forloop(void);
-void register_node_type_cmp_whileloop(void);
 
 void register_node_type_cmp_rlayers(void);
 void register_node_type_cmp_image(void);
@@ -127,7 +125,7 @@ void register_node_type_cmp_mask(void);
 void register_node_type_cmp_glare(void);
 void register_node_type_cmp_tonemap(void);
 void register_node_type_cmp_lensdist(void);
-
+void register_node_type_cmp_sunbeams(void);
 
 void register_node_type_cmp_colorcorrection(void);
 void register_node_type_cmp_boxmask(void);
@@ -135,10 +133,14 @@ void register_node_type_cmp_ellipsemask(void);
 void register_node_type_cmp_bokehimage(void);
 void register_node_type_cmp_bokehblur(void);
 void register_node_type_cmp_switch(void);
+void register_node_type_cmp_switch_view(void);
 void register_node_type_cmp_pixelate(void);
 void register_node_type_cmp_trackpos(void);
 void register_node_type_cmp_planetrackdeform(void);
+void register_node_type_cmp_cornerpin(void);
 
-void node_cmp_rlayers_force_hidden_passes(struct bNode *node);
+void node_cmp_rlayers_outputs(struct bNodeTree *ntree, struct bNode *node);
+void node_cmp_rlayers_register_pass(struct bNodeTree *ntree, struct bNode *node, struct Scene *scene, struct SceneRenderLayer *srl, const char *name, int type);
+const char *node_cmp_rlayers_sock_to_pass(int sock_index);
 
 #endif