Merged

https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).

After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.

1 files changed, 0 insertions, 28 deletions

diff --git a/source/blender/makesdna/DNA_freestyle_types.h b/source/blender/makesdna/DNA_freestyle_types.h
deleted file mode 100644
index 14c59d5adb2..00000000000
--- a/source/blender/makesdna/DNA_freestyle_types.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef DNA_FREESTYLE_TYPES_H
-#define DNA_FREESTYLE_TYPES_H
-
-#include "DNA_listBase.h"
-
-typedef struct FreestyleModuleConfig {
-	struct FreestyleModuleConfig *next, *prev;
-	
-	char module_path[256];
-	short is_displayed;
-	short pad[3];
-	
-} FreestyleModuleConfig;
-
-typedef struct FreestyleConfig {
-	ListBase modules;
-	
-	int flags;
-	float sphere_radius;
-	float dkr_epsilon;
-	int pad;
-	
-} FreestyleConfig;
-
-
-
-#endif
-