X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fmain.cpp;h=faa0d7a013a3e14093090091399f701c3eea5b1c;hb=1d8a47082e8cc0b3fab7d77862c73cb5f3f41aef;hp=6a166f5459c26ee0d2a5c4fa2f479e09b01c44b7;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;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 6a166f5..faa0d7a 100644
--- a/synfig-core/trunk/src/modules/lyr_std/main.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/main.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -65,6 +66,7 @@
 
 #include "warp.h"
 #include "timeloop.h"
+#include "curvewarp.h"
 
 #endif
 
@@ -80,35 +82,23 @@ 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