From 65850038127c5cb49d09374b1776aa5dce11c674 Mon Sep 17 00:00:00 2001 From: dooglus Date: Tue, 4 Sep 2007 16:09:07 +0000 Subject: [PATCH] Use lower_case "xor_pattern" in .sif files rather than "XORPattern". git-svn-id: http://svn.voria.com/code@591 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/modules/lyr_std/main.cpp | 25 ++++++---------------- .../trunk/src/modules/lyr_std/xorpattern.cpp | 7 ++++-- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/synfig-core/trunk/src/modules/lyr_std/main.cpp b/synfig-core/trunk/src/modules/lyr_std/main.cpp index 6a166f5..bf5050a 100644 --- a/synfig-core/trunk/src/modules/lyr_std/main.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/main.cpp @@ -80,31 +80,18 @@ MODULE_DESC_END MODULE_INVENTORY_BEGIN(liblyr_std) BEGIN_LAYERS - LAYER(Zoom) -// LAYER(Blur_Layer) -// LAYER(RadialBlur) - LAYER(Import) - LAYER(Translate) - LAYER(SuperSample) - LAYER(Rotate) + LAYER(Zoom) LAYER_ALIAS(Zoom,"Zoom") + LAYER(Import) LAYER_ALIAS(Import,"Import") + LAYER(Translate) LAYER_ALIAS(Translate,"Translate") + LAYER(SuperSample) LAYER_ALIAS(SuperSample,"SuperSample") + LAYER(Rotate) LAYER_ALIAS(Rotate,"Rotate") LAYER(Warp) - - LAYER_ALIAS(Zoom,"Zoom") - LAYER_ALIAS(Translate,"Translate") - LAYER_ALIAS(SuperSample,"SuperSample") - LAYER_ALIAS(Rotate,"Rotate") - LAYER_ALIAS(Import,"Import") -// LAYER_ALIAS(Blur_Layer,"Blur") - -// LAYER(Halftone2) - LAYER(Julia) LAYER(InsideOut) LAYER(Mandelbrot) LAYER(Layer_Clamp) LAYER(Layer_Stretch) -// LAYER(Layer_ColorCorrect) -// LAYER(XORPattern) + LAYER(XORPattern) LAYER_ALIAS(XORPattern,"XORPattern") LAYER(Twirl) LAYER(Layer_Shade) LAYER(Layer_Bevel) diff --git a/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp b/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp index aaf3a9f..7379be8 100644 --- a/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp @@ -49,7 +49,7 @@ /* === G L O B A L S ======================================================= */ SYNFIG_LAYER_INIT(XORPattern); -SYNFIG_LAYER_SET_NAME(XORPattern,"XORPattern"); +SYNFIG_LAYER_SET_NAME(XORPattern,"xor_pattern"); SYNFIG_LAYER_SET_LOCAL_NAME(XORPattern,_("XOR Pattern")); SYNFIG_LAYER_SET_CATEGORY(XORPattern,_("Other")); SYNFIG_LAYER_SET_VERSION(XORPattern,"0.1"); @@ -93,7 +93,10 @@ XORPattern::get_color(Context context, const Point &point)const unsigned char gindex=(a^(~b))*4; unsigned char bindex=~(a^b)*2; - return Color((Color::value_type)rindex/(Color::value_type)255.0,(Color::value_type)gindex/(Color::value_type)255.0,(Color::value_type)bindex/(Color::value_type)255.0,1.0); + return Color((Color::value_type)rindex/(Color::value_type)255.0, + (Color::value_type)gindex/(Color::value_type)255.0, + (Color::value_type)bindex/(Color::value_type)255.0, + 1.0); } Layer::Vocab -- 2.7.4