From 78fbd146f3cd9a5c97307ff6f2d14422e7ae54b9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 17 Jun 2018 17:04:09 +0200 Subject: Cleanup: trailing space for DNA headers --- source/blender/makesdna/DNA_scene_types.h | 130 +++++++++++++++--------------- 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'source/blender/makesdna/DNA_scene_types.h') diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index d2b71c727c5..2a62adae21f 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -188,12 +188,12 @@ typedef struct AudioData { /* Render Layer */ typedef struct SceneRenderLayer { struct SceneRenderLayer *next, *prev; - + char name[64]; /* MAX_NAME */ - + struct Material *mat_override; struct Group *light_override; - + unsigned int lay; /* Scene.lay itself has priority over this */ unsigned int lay_zmask; /* has to be after lay, this is for Z-masking */ unsigned int lay_exclude; /* not used by internal, exclude */ @@ -560,7 +560,7 @@ typedef enum eBakePassFilter { typedef struct RenderData { struct ImageFormatData im_format; - + struct AviCodecData *avicodecdata; struct FFMpegCodecData ffcodecdata; @@ -587,13 +587,13 @@ typedef struct RenderData { int frame_step; /* frames to jump during render/playback */ short stereomode DNA_DEPRECATED; /* standalone player stereo settings */ // XXX deprecated since 2.5 - + short dimensionspreset; /* for the dimensions presets menu */ short filtertype; /* filter is box, tent, gauss, mitch, etc */ short size; /* size in % */ - + short maximsize DNA_DEPRECATED; /* max in Kb */ short pad6; @@ -623,7 +623,7 @@ typedef struct RenderData { int tilex, tiley; short planes DNA_DEPRECATED, imtype DNA_DEPRECATED, subimtype DNA_DEPRECATED, quality DNA_DEPRECATED; /*deprecated!*/ - + /** * Render to image editor, fullscreen or to new window. */ @@ -645,7 +645,7 @@ typedef struct RenderData { * Flags for raytrace settings. Use bit-masking to access the settings. */ int raytrace_options; - + /** * Raytrace acceleration structure */ @@ -656,7 +656,7 @@ typedef struct RenderData { /* octree resolution */ short ocres; short pad4; - + /** * What to do with the sky/background. Picks sky/premul/key * blending for the background @@ -670,39 +670,39 @@ typedef struct RenderData { short frs_sec, edgeint; - + /* safety, border and display rect */ rctf safety, border; rcti disprect; - + /* information on different layers to be rendered */ ListBase layers; short actlay; - + /* number of mblur samples */ short mblur_samples; - + /** * Adjustment factors for the aspect ratio in the x direction, was a short in 2.45 */ float xasp, yasp; float frs_sec_base; - + /** * Value used to define filter size for all filter options */ float gauss; - - + + /* color management settings - color profiles, gamma correction, etc */ int color_mgt_flag; - + /** post-production settings. deprecated, but here for upwards compat (initialized to 1) */ float postgamma, posthue, postsat; - + /* Dither noise intensity */ float dither_intensity; - + /* Bake Render options */ short bake_osa, bake_filter, bake_mode, bake_flag; short bake_normal_space, bake_quad_split; @@ -742,7 +742,7 @@ typedef struct RenderData { /* cineon */ short cineonwhite DNA_DEPRECATED, cineonblack DNA_DEPRECATED; /*deprecated*/ float cineongamma DNA_DEPRECATED; /*deprecated*/ - + /* jpeg2000 */ short jp2_preset DNA_DEPRECATED, jp2_depth DNA_DEPRECATED; /*deprecated*/ int rpad3; @@ -789,14 +789,14 @@ typedef struct RenderData { typedef struct RenderProfile { struct RenderProfile *next, *prev; char name[32]; - + short particle_perc; short subsurf_max; short shadbufsample_max; short pad1; - + float ao_error, pad2; - + } RenderProfile; /* *************************************************************** */ @@ -1033,7 +1033,7 @@ typedef struct Paint { /* Paint stroke can use up to PAINT_MAX_INPUT_SAMPLES inputs to * smooth the stroke */ int num_input_samples; - + /* flags used for symmetry */ int symmetry_flags; @@ -1049,7 +1049,7 @@ typedef struct ImagePaintSettings { Paint paint; short flag, missing_data; - + /* for projection painting only */ short seam_bleed, normal_angle; short screen_grab_size[2]; /* capture size for re-projection */ @@ -1192,10 +1192,10 @@ typedef enum eGP_EditBrush_Flag { GP_EDITBRUSH_FLAG_INVERT = (1 << 0), /* adjust strength using pen pressure */ GP_EDITBRUSH_FLAG_USE_PRESSURE = (1 << 1), - + /* strength of brush falls off with distance from cursor */ GP_EDITBRUSH_FLAG_USE_FALLOFF = (1 << 2), - + /* smooth brush affects pressure values as well */ GP_EDITBRUSH_FLAG_SMOOTH_PRESSURE = (1 << 3) } eGP_EditBrush_Flag; @@ -1206,7 +1206,7 @@ typedef enum eGP_EditBrush_Flag { typedef struct GP_BrushEdit_Settings { GP_EditBrush_Data brush[11]; /* TOT_GP_EDITBRUSH_TYPES */ void *paintcursor; /* runtime */ - + int brushtype; /* eGP_EditBrush_Types */ int flag; /* eGP_BrushEdit_SettingsFlag */ int lock_axis; /* eGP_Lockaxis_Types lock drawing to one axis */ @@ -1229,13 +1229,13 @@ typedef enum eGP_BrushEdit_SettingsFlag { /* Settings for GP Interpolation Operators */ typedef struct GP_Interpolate_Settings { short flag; /* eGP_Interpolate_SettingsFlag */ - - char type; /* eGP_Interpolate_Type - Interpolation Mode */ + + char type; /* eGP_Interpolate_Type - Interpolation Mode */ char easing; /* eBezTriple_Easing - Easing mode (if easing equation used) */ - + float back; /* BEZT_IPO_BACK */ float amplitude, period; /* BEZT_IPO_ELASTIC */ - + struct CurveMapping *custom_ipo; /* custom interpolation curve (for use with GP_IPO_CURVEMAP) */ } GP_Interpolate_Settings; @@ -1251,10 +1251,10 @@ typedef enum eGP_Interpolate_SettingsFlag { typedef enum eGP_Interpolate_Type { /* Traditional Linear Interpolation */ GP_IPO_LINEAR = 0, - + /* CurveMap Defined Interpolation */ GP_IPO_CURVEMAP = 1, - + /* Easing Equations */ GP_IPO_BACK = 3, GP_IPO_BOUNCE = 4, @@ -1312,11 +1312,11 @@ typedef struct UnifiedPaintSettings { /* record movement of mouse so that rake can start at an intuitive angle */ float last_rake[2]; float last_rake_angle; - + int last_stroke_valid; float average_stroke_accum[3]; int average_stroke_counter; - + float brush_rotation; float brush_rotation_sec; @@ -1452,7 +1452,7 @@ typedef struct ToolSettings { VPaint *wpaint; /* weight paint */ Sculpt *sculpt; UvSculpt *uvsculpt; /* uv smooth */ - + /* Vertex group weight - used only for editmode, not weight * paint */ float vgroup_weight; @@ -1483,22 +1483,22 @@ typedef struct ToolSettings { char gpencil_v2d_align; /* : General 2D Editor */ char gpencil_seq_align; /* : Sequencer Preview */ char gpencil_ima_align; /* : Image Editor */ - + /* Grease Pencil Sculpt */ struct GP_BrushEdit_Settings gp_sculpt; - + /* Grease Pencil Interpolation Tool(s) */ struct GP_Interpolate_Settings gp_interpolate; - + /* Grease Pencil Drawing Brushes (bGPDbrush) */ - ListBase gp_brushes; + ListBase gp_brushes; /* Image Paint (8 byttse aligned please!) */ struct ImagePaintSettings imapaint; /* Particle Editing */ struct ParticleEditSettings particle; - + /* Transform Proportional Area of Effect */ float proportional_size; @@ -1539,7 +1539,7 @@ typedef struct ToolSettings { char skgen_retarget_roll; char skgen_side_string[8]; char skgen_num_string[8]; - + /* Alt+RMB option */ char edge_mode; char edge_mode_live_unwrap; @@ -1632,33 +1632,33 @@ typedef struct DisplaySafeAreas { typedef struct Scene { ID id; - struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ - + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ + struct Object *camera; struct World *world; - + struct Scene *set; - + ListBase base; struct Base *basact; /* active base */ struct Object *obedit; /* name replaces old G.obedit */ - + float cursor[3]; /* 3d cursor location */ char _pad[4]; - + unsigned int lay; /* bitflags for layer visibility */ int layact; /* active layer */ unsigned int lay_updated; /* runtime flag, has layer ever been updated since load? */ - + short flag; /* various settings */ - + char use_nodes; char pad[1]; - + struct bNodeTree *nodetree; - + struct Editing *ed; /* sequence editor data is allocated here */ - + struct ToolSettings *toolsettings; /* default allocated now */ struct SceneStats *stats; /* default allocated now */ struct DisplaySafeAreas safe_areas; @@ -1667,17 +1667,17 @@ typedef struct Scene { /* no, is on the right place (ton) */ struct RenderData r; struct AudioData audio; - + ListBase markers; ListBase transform_spaces; - + void *sound_scene; void *playback_handle; void *sound_scrub_handle; void *speaker_handles; - + void *fps_info; /* (runtime) info/cache used for presenting playback framerate info to the user */ - + /* none of the dependency graph vars is mean to be saved */ struct Depsgraph *depsgraph; void *pad1; @@ -1688,14 +1688,14 @@ typedef struct Scene { /* User-Defined KeyingSets */ int active_keyingset; /* index of the active KeyingSet. first KeyingSet has index 1, 'none' active is 0, 'add new' is -1 */ ListBase keyingsets; /* KeyingSets for this scene */ - + /* Game Settings */ struct GameFraming framing DNA_DEPRECATED; // XXX deprecated since 2.5 struct GameData gm; /* Units */ struct UnitSettings unit; - + /* Grease Pencil */ struct bGPdata *gpd; @@ -1712,7 +1712,7 @@ typedef struct Scene { ColorManagedViewSettings view_settings; ColorManagedDisplaySettings display_settings; ColorManagedColorspaceSettings sequencer_colorspace_settings; - + /* RigidBody simulation world+settings */ struct RigidBodyWorld *rigidbody_world; @@ -1754,7 +1754,7 @@ typedef struct Scene { /* threads obsolete... is there for old files, now use for autodetect threads */ #define R_THREADS 0x80000 /* Use the same flag for autothreads */ -#define R_FIXED_THREADS 0x80000 +#define R_FIXED_THREADS 0x80000 #define R_SPEED 0x100000 #define R_SSS 0x200000 @@ -2218,14 +2218,14 @@ typedef enum eGPencil_Source_3D { typedef enum eGPencil_Placement_Flags { /* New strokes are added in viewport/data space (i.e. not screen space) */ GP_PROJECT_VIEWSPACE = (1 << 0), - + /* Viewport space, but relative to render canvas (Sequencer Preview Only) */ GP_PROJECT_CANVAS = (1 << 1), - + /* Project into the screen's Z values */ GP_PROJECT_DEPTH_VIEW = (1 << 2), GP_PROJECT_DEPTH_STROKE = (1 << 3), - + /* "Use Endpoints" */ GP_PROJECT_DEPTH_STROKE_ENDPOINTS = (1 << 4), } eGPencil_Placement_Flags; -- cgit v1.2.3