← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/makesdna/DNA_scene_types.h

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2007-05-17 11:47:59 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517114759-yp4ybrnhp2u7pk66
Tags: 2.44-1
* New upstream release.
* Drop debian/patches/01_64bits_stupidity, not needed anymore: as of this
  version blender is 64 bits safe again. Adjust README.Debian accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/makesdna/DNA_scene_types.h
1
1
/**
2
 
 * $Id: DNA_scene_types.h,v 1.106 2007/02/07 09:17:57 ton Exp $ 
 
2
 * $Id: DNA_scene_types.h,v 1.111 2007/04/24 14:52:34 ton Exp $ 
3
3
 *
4
4
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
5
5
 *
162
162
        struct QuicktimeCodecData *qtcodecdata;
163
163
        struct FFMpegCodecData ffcodecdata;
164
164
 
165
 
        int cfra, sfra, efra;   /* fames as in 'images' */
 
165
        int cfra, sfra, efra;   /* frames as in 'images' */
 
166
        int psfra, pefra;               /* start+end frames of preview range */
166
167
 
167
168
        int images, framapto;
168
169
        short flag, threads;
170
171
        float ctime;                    /* use for calcutions */
171
172
        float framelen, blurfac;
172
173
 
173
 
        /** For UR edge rendering: give the edges this colour */
 
174
        /** For UR edge rendering: give the edges this color */
174
175
        float edgeR, edgeG, edgeB;
175
176
        
176
177
        short fullscreen, xplay, yplay, freqplay;       /* standalone player */
334
335
 
335
336
        short pad2;
336
337
        
 
338
        /* Image Paint (8 byte aligned please!) */
 
339
        struct ImagePaintSettings imapaint;
 
340
        
337
341
        /* Select Group Threshold */
338
342
        float select_thresh;
339
 
 
340
 
        /* Image Paint */
341
 
        struct ImagePaintSettings imapaint;
342
343
        
343
344
        /* IPO-Editor */
344
345
        float clean_thresh;
347
348
        char retopo_mode;
348
349
        char retopo_paint_tool;
349
350
        char line_div, ellipse_div, retopo_hotspot;
 
351
 
 
352
        /* Multires */
 
353
        char multires_subdiv_type;
350
354
        
351
 
        char  pad4[3];
 
355
        char  pad4[2];
352
356
} ToolSettings;
353
357
 
354
358
/* Used by all brushes to store their properties, which can be directly set
373
377
        struct MTex *mtex[10];
374
378
 
375
379
        /* Settings for each brush */
376
 
        BrushData drawbrush, smoothbrush, pinchbrush, inflatebrush, grabbrush, layerbrush;
 
380
        BrushData drawbrush, smoothbrush, pinchbrush, inflatebrush, grabbrush, layerbrush, flattenbrush;
377
381
        short brush_type;
378
382
 
379
383
        /* For the Brush Shape */
605
609
#define INFLATE_BRUSH 4
606
610
#define GRAB_BRUSH 5
607
611
#define LAYER_BRUSH 6
 
612
#define FLATTEN_BRUSH 7
608
613
/* SculptData.texrept */
609
614
#define SCULPTREPT_DRAG 1
610
615
#define SCULPTREPT_TILE 2