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>2019-03-18 06:13:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-18 06:13:06 +0300
commit317cb1dd6507be3e043e32eb1ddaece509bbbbb5 (patch)
tree4fca876d6b13da8cbd21ddc848f79811a3ca1796 /source/blender/makesrna
parent6c0240e84a2c06af506697242e0ba42fa4998ee5 (diff)
Cleanup: style, duplicate include
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_nodetree.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 591cabac98f..248a1486d48 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -56,8 +56,6 @@
#include "RE_render_ext.h"
-#include "NOD_composite.h"
-
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
@@ -2470,9 +2468,9 @@ static StructRNA *rna_NodeCustomGroup_register(
}
static StructRNA *rna_ShaderNodeCustomGroup_register(
- Main * bmain, ReportList *reports,
- void *data, const char *identifier,
- StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
+ Main *bmain, ReportList *reports,
+ void *data, const char *identifier,
+ StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
{
bNodeType * nt = rna_Node_register_base(bmain, reports, &RNA_ShaderNodeCustomGroup, data, identifier, validate, call, free);
@@ -2492,9 +2490,9 @@ static StructRNA *rna_ShaderNodeCustomGroup_register(
}
static StructRNA *rna_CompositorNodeCustomGroup_register(
- Main *bmain, ReportList *reports,
- void *data, const char *identifier,
- StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
+ Main *bmain, ReportList *reports,
+ void *data, const char *identifier,
+ StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
{
bNodeType *nt = rna_Node_register_base(bmain, reports, &RNA_CompositorNodeCustomGroup, data, identifier, validate, call, free);
if (!nt)
@@ -3463,8 +3461,9 @@ static void def_group(StructRNA *srna)
RNA_def_property_ui_text(prop, "Interface", "Interface socket data");
}
-static void def_custom_group(BlenderRNA *brna, const char *struct_name, const char *base_name,
- const char *ui_name, const char *ui_desc, const char *reg_func)
+static void def_custom_group(
+ BlenderRNA *brna, const char *struct_name, const char *base_name,
+ const char *ui_name, const char *ui_desc, const char *reg_func)
{
StructRNA *srna;
@@ -8672,7 +8671,7 @@ void RNA_def_nodetree(BlenderRNA *brna)
define_specific_node(brna, "TextureNodeGroup", "TextureNode", "Group", "", def_group);
def_custom_group(brna, "ShaderNodeCustomGroup", "ShaderNode", "Shader Custom Group", "Custom Shader Group Node for Python nodes", "rna_ShaderNodeCustomGroup_register");
def_custom_group(brna, "CompositorNodeCustomGroup", "CompositorNode", "Compositor Custom Group", "Custom Compositor Group Node for Python nodes", "rna_CompositorNodeCustomGroup_register");
- def_custom_group(brna, "NodeCustomGroup", "Node", "Custom Group", "Base node type for custom registered node group types", "rna_NodeCustomGroup_register");
+ def_custom_group(brna, "NodeCustomGroup", "Node", "Custom Group", "Base node type for custom registered node group types", "rna_NodeCustomGroup_register");
/* special socket types */
rna_def_cmp_output_file_slot_file(brna);