Merge branch 'master' into blender2.8

13 files changed, 0 insertions, 14 deletions

diff --git a/source/blender/nodes/NOD_shader.h b/source/blender/nodes/NOD_shader.h
index 158d20a5c19..83a5f5c5bf1 100644
--- a/source/blender/nodes/NOD_shader.h
+++ b/source/blender/nodes/NOD_shader.h
@@ -139,5 +139,3 @@ void register_node_type_sh_bump(void);
 void register_node_type_sh_tex_ies(void);
 
 #endif
-
-
diff --git a/source/blender/nodes/composite/node_composite_util.h b/source/blender/nodes/composite/node_composite_util.h
index 25827d914f4..193cdb90003 100644
--- a/source/blender/nodes/composite/node_composite_util.h
+++ b/source/blender/nodes/composite/node_composite_util.h
@@ -65,4 +65,3 @@ void cmp_node_update_default(struct bNodeTree *UNUSED(ntree), struct bNode *node
 void cmp_node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass, short flag);
 
 #endif  /* __NODE_COMPOSITE_UTIL_H__ */
-
diff --git a/source/blender/nodes/composite/nodes/node_composite_common.c b/source/blender/nodes/composite/nodes/node_composite_common.c
index de97a5beac3..8efa44e2e5d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_common.c
+++ b/source/blender/nodes/composite/nodes/node_composite_common.c
@@ -64,4 +64,3 @@ void register_node_type_cmp_group(void)
 
 	nodeRegisterType(&ntype);
 }
-
diff --git a/source/blender/nodes/composite/nodes/node_composite_switch.c b/source/blender/nodes/composite/nodes/node_composite_switch.c
index d7de26730d0..60d8a13d8d7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_switch.c
+++ b/source/blender/nodes/composite/nodes/node_composite_switch.c
@@ -53,4 +53,3 @@ void register_node_type_cmp_switch(void)
 	node_type_size_preset(&ntype, NODE_SIZE_SMALL);
 	nodeRegisterType(&ntype);
 }
-
diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c
index a4b2c155675..e7069202b64 100644
--- a/source/blender/nodes/shader/node_shader_util.c
+++ b/source/blender/nodes/shader/node_shader_util.c
@@ -266,4 +266,3 @@ void node_shader_gpu_tex_mapping(GPUMaterial *mat, bNode *node, GPUNodeStack *in
 			GPU_link(mat, "texco_norm", in[0].link, &in[0].link);
 	}
 }
-
diff --git a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
index 0ccfb64a37d..673e6c61885 100644
--- a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
+++ b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
@@ -70,4 +70,3 @@ void register_node_type_sh_ambient_occlusion(void)
 
 	nodeRegisterType(&ntype);
 }
-
diff --git a/source/blender/nodes/shader/nodes/node_shader_attribute.c b/source/blender/nodes/shader/nodes/node_shader_attribute.c
index 0ea1348df05..05091a2709a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_attribute.c
+++ b/source/blender/nodes/shader/nodes/node_shader_attribute.c
@@ -84,4 +84,3 @@ void register_node_type_sh_attribute(void)
 
 	nodeRegisterType(&ntype);
 }
-
diff --git a/source/blender/nodes/shader/nodes/node_shader_light_falloff.c b/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
index 56b790b3835..1dd7a945259 100644
--- a/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
+++ b/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
@@ -64,4 +64,3 @@ void register_node_type_sh_light_falloff(void)
 
 	nodeRegisterType(&ntype);
 }
-
diff --git a/source/blender/nodes/shader/nodes/node_shader_object_info.c b/source/blender/nodes/shader/nodes/node_shader_object_info.c
index cba4f2854f8..623df319690 100644
--- a/source/blender/nodes/shader/nodes/node_shader_object_info.c
+++ b/source/blender/nodes/shader/nodes/node_shader_object_info.c
@@ -61,4 +61,3 @@ void register_node_type_sh_object_info(void)
 
 	nodeRegisterType(&ntype);
 }
-
diff --git a/source/blender/nodes/shader/nodes/node_shader_particle_info.c b/source/blender/nodes/shader/nodes/node_shader_particle_info.c
index 46cb513a6d9..73c95fa2ba7 100644
--- a/source/blender/nodes/shader/nodes/node_shader_particle_info.c
+++ b/source/blender/nodes/shader/nodes/node_shader_particle_info.c
@@ -69,4 +69,3 @@ void register_node_type_sh_particle_info(void)
 
 	nodeRegisterType(&ntype);
 }
-
diff --git a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
index 7bf44792e7f..60442a46da1 100644
--- a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
+++ b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
@@ -100,4 +100,3 @@ void register_node_type_sh_subsurface_scattering(void)
 
 	nodeRegisterType(&ntype);
 }
-
diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_principled.c b/source/blender/nodes/shader/nodes/node_shader_volume_principled.c
index 4fbd9af1b58..40d24df6845 100644
--- a/source/blender/nodes/shader/nodes/node_shader_volume_principled.c
+++ b/source/blender/nodes/shader/nodes/node_shader_volume_principled.c
@@ -162,4 +162,3 @@ void register_node_type_sh_volume_principled(void)
 
 	nodeRegisterType(&ntype);
 }
-
diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_scatter.c b/source/blender/nodes/shader/nodes/node_shader_volume_scatter.c
index 80cc5a467a1..34ba179b4a3 100644
--- a/source/blender/nodes/shader/nodes/node_shader_volume_scatter.c
+++ b/source/blender/nodes/shader/nodes/node_shader_volume_scatter.c
@@ -60,4 +60,3 @@ void register_node_type_sh_volume_scatter(void)
 
 	nodeRegisterType(&ntype);
 }
-