diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
commit | be50ce61be7fdc96943dbdac79aabd88ba29996f (patch) | |
tree | 4dfde72478458923a3b2ce8d22e1658d4508024c /source/blender/makesdna/DNA_freestyle_types.h | |
parent | 0a4d70f4d0ddc5bc709b162d84ec334e66ed848d (diff) |
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.
Diffstat (limited to 'source/blender/makesdna/DNA_freestyle_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_freestyle_types.h | 28 |
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 - |