From 060adfbd1b85277a1f7c4b32e2d26e6922e5af0a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 11 Oct 2018 08:14:04 +1100 Subject: Correct case --- source/blender/shader_fx/intern/FX_shader_glow.c | 78 ++++++++++++++++++++++++ source/blender/shader_fx/intern/fx_shader_glow.c | 78 ------------------------ 2 files changed, 78 insertions(+), 78 deletions(-) create mode 100644 source/blender/shader_fx/intern/FX_shader_glow.c delete mode 100644 source/blender/shader_fx/intern/fx_shader_glow.c (limited to 'source/blender/shader_fx') diff --git a/source/blender/shader_fx/intern/FX_shader_glow.c b/source/blender/shader_fx/intern/FX_shader_glow.c new file mode 100644 index 00000000000..cd513ed1f0a --- /dev/null +++ b/source/blender/shader_fx/intern/FX_shader_glow.c @@ -0,0 +1,78 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2018, Blender Foundation + * This is a new part of Blender + * + * Contributor(s): Antonio Vazquez + * + * ***** END GPL LICENSE BLOCK ***** + * + */ + +/** \file blender/shader_fx/intern/FX_shader_glow.c + * \ingroup shader_fx + */ + +#include + +#include "DNA_scene_types.h" +#include "DNA_object_types.h" +#include "DNA_gpencil_types.h" + +#include "BLI_math_base.h" +#include "BLI_utildefines.h" + +#include "BKE_library_query.h" +#include "BKE_modifier.h" +#include "BKE_shader_fx.h" + +#include "FX_shader_types.h" + +static void initData(ShaderFxData *md) +{ + GlowShaderFxData *gpfx = (GlowShaderFxData *)md; + ARRAY_SET_ITEMS(gpfx->glow_color, 0.75f, 1.0f, 1.0f); + ARRAY_SET_ITEMS(gpfx->select_color, 0.0f, 0.0f, 0.0f); + gpfx->threshold = 0.1f; + + ARRAY_SET_ITEMS(gpfx->blur, 50, 0); + gpfx->samples = 16; +} + +static void copyData(const ShaderFxData *md, ShaderFxData *target) +{ + BKE_shaderfx_copyData_generic(md, target); +} + +ShaderFxTypeInfo shaderfx_Type_Glow = { + /* name */ "Glow", + /* structName */ "GlowShaderFxData", + /* structSize */ sizeof(GlowShaderFxData), + /* type */ eShaderFxType_GpencilType, + /* flags */ 0, + + /* copyData */ copyData, + + /* initData */ initData, + /* freeData */ NULL, + /* isDisabled */ NULL, + /* updateDepsgraph */ NULL, + /* dependsOnTime */ NULL, + /* foreachObjectLink */ NULL, + /* foreachIDLink */ NULL, +}; diff --git a/source/blender/shader_fx/intern/fx_shader_glow.c b/source/blender/shader_fx/intern/fx_shader_glow.c deleted file mode 100644 index cd513ed1f0a..00000000000 --- a/source/blender/shader_fx/intern/fx_shader_glow.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2018, Blender Foundation - * This is a new part of Blender - * - * Contributor(s): Antonio Vazquez - * - * ***** END GPL LICENSE BLOCK ***** - * - */ - -/** \file blender/shader_fx/intern/FX_shader_glow.c - * \ingroup shader_fx - */ - -#include - -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_gpencil_types.h" - -#include "BLI_math_base.h" -#include "BLI_utildefines.h" - -#include "BKE_library_query.h" -#include "BKE_modifier.h" -#include "BKE_shader_fx.h" - -#include "FX_shader_types.h" - -static void initData(ShaderFxData *md) -{ - GlowShaderFxData *gpfx = (GlowShaderFxData *)md; - ARRAY_SET_ITEMS(gpfx->glow_color, 0.75f, 1.0f, 1.0f); - ARRAY_SET_ITEMS(gpfx->select_color, 0.0f, 0.0f, 0.0f); - gpfx->threshold = 0.1f; - - ARRAY_SET_ITEMS(gpfx->blur, 50, 0); - gpfx->samples = 16; -} - -static void copyData(const ShaderFxData *md, ShaderFxData *target) -{ - BKE_shaderfx_copyData_generic(md, target); -} - -ShaderFxTypeInfo shaderfx_Type_Glow = { - /* name */ "Glow", - /* structName */ "GlowShaderFxData", - /* structSize */ sizeof(GlowShaderFxData), - /* type */ eShaderFxType_GpencilType, - /* flags */ 0, - - /* copyData */ copyData, - - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachObjectLink */ NULL, - /* foreachIDLink */ NULL, -}; -- cgit v1.2.3