diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/nodes/shader | |
parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes/shader')
9 files changed, 0 insertions, 9 deletions
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); } - |