diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-04 21:26:35 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-04 21:26:35 +0400 |
| commit | 756ac13e3a17e1820c5151f1fff8cb21833a1f0f (patch) | |
| tree | e6a706fe334a90397109c479acc667781c24a075 /source/blender/makesdna | |
| parent | 17493c77f4f876910436648f18c0125d20f24809 (diff) | |
| parent | 3eaf5e93fd6625fdcca7fd81e6d5ff202ef8b726 (diff) | |
Merging r42394 through r42412 form trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index d8d3f05ce01..1b849754db8 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -389,8 +389,7 @@ typedef struct RenderData { */ short raytrace_structure; - /* renderer (deprecated) */ - short renderer DNA_DEPRECATED; + short pad1; /* octree resolution */ short ocres; @@ -1036,10 +1035,6 @@ typedef struct Scene { #define R_FILTER_MITCH 6 #define R_FILTER_FAST_GAUSS 7 /* note, this is only used for nodes at the moment */ -/* yafray: renderer flag (not only exclusive to yafray) */ -#define R_INTERN 0 -#define R_YAFRAY 1 - /* raytrace structure */ #define R_RAYSTRUCTURE_AUTO 0 #define R_RAYSTRUCTURE_OCTREE 1 |