X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fmain.cpp;h=faa0d7a013a3e14093090091399f701c3eea5b1c;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=8d090097ad676ba11a6c3343d4760d0135c7849d;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_std/main.cpp b/synfig-core/trunk/src/modules/lyr_std/main.cpp
index 8d09009..faa0d7a 100644
--- a/synfig-core/trunk/src/modules/lyr_std/main.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/main.cpp
@@ -1,18 +1,23 @@
-/*! ========================================================================
-** Sinfg
-** bleh
-** $Id: main.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file lyr_std/main.cpp
+**	\brief Template Header
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	$Id$
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+**	This package 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 package 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.
+**	\endlegal
 **
 ** === N O T E S ===========================================================
 **
@@ -20,7 +25,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SINFG_MODULE
+#define SYNFIG_MODULE
 
 #ifdef USING_PCH
 #	include "pch.h"
@@ -29,8 +34,8 @@
 #	include <config.h>
 #endif
 
-#include <sinfg/module.h>
-#include <sinfg/string.h>
+#include <synfig/module.h>
+#include <synfig/string.h>
 
 #include "zoom.h"
 //#include "blur.h"
@@ -61,6 +66,7 @@
 
 #include "warp.h"
 #include "timeloop.h"
+#include "curvewarp.h"
 
 #endif
 
@@ -71,40 +77,28 @@ MODULE_DESC_BEGIN(liblyr_std)
 	MODULE_DESCRIPTION("Provides a basic set of standard layers")
 	MODULE_AUTHOR("Robert B. Quattlebaum")
 	MODULE_VERSION("1.0")
-	MODULE_COPYRIGHT(SINFG_COPYRIGHT)
+	MODULE_COPYRIGHT(SYNFIG_COPYRIGHT)
 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)
 		LAYER(Layer_TimeLoop)
 		LAYER(Layer_SphereDistort)
+		LAYER(CurveWarp)
 	END_LAYERS
 MODULE_INVENTORY_END