diff options
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index d58bc3aa9bc..73a0e366547 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -36,13 +36,13 @@ extern "C" { #endif -#include "DNA_brush_types.h" #include "DNA_vec_types.h" #include "DNA_listBase.h" #include "DNA_ID.h" #include "DNA_freestyle_types.h" struct Object; +struct Brush; struct World; struct Scene; struct Image; @@ -350,7 +350,7 @@ typedef struct RenderData { short bake_normal_space, bake_quad_split; float bake_maxdist, bake_biasdist, bake_pad; - /* paths to backbufffer, output, ftype */ + /* paths to backbufffer, output */ char backbuf[160], pic[160]; /* stamps flags. */ @@ -512,9 +512,7 @@ typedef struct TimeMarker { } TimeMarker; typedef struct Paint { - /* Array of brushes selected for use in this paint mode */ - Brush **brushes; - int active_brush_index, brush_count; + struct Brush *brush; /* WM Paint cursor */ void *paint_cursor; @@ -967,8 +965,8 @@ typedef struct Scene { /* imtype */ #define R_TARGA 0 #define R_IRIS 1 -#define R_HAMX 2 -#define R_FTYPE 3 /* ftype is nomore */ +/* #define R_HAMX 2 */ /* hamx is nomore */ +/* #define R_FTYPE 3 */ /* ftype is nomore */ #define R_JPEG90 4 #define R_MOVIE 5 #define R_IRIZ 7 |