diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-12-22 07:11:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-22 07:12:19 +0400 |
commit | c1c26c36f62c3bfdb40b01f33004695a09ce2f4d (patch) | |
tree | 21e738fefe0c7d77af7c1129bcdfef65e1a8f655 /source/blender/editors/space_view3d/drawvolume.c | |
parent | 5eb96d4705b93a7049ecabd0827e0e58b28a2838 (diff) |
Style Cleanup: remove preprocessor indentation (updated wiki style guide too)
Diffstat (limited to 'source/blender/editors/space_view3d/drawvolume.c')
-rw-r--r-- | source/blender/editors/space_view3d/drawvolume.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index eb4493a9d1a..32e21a0fbbe 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -244,10 +244,10 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob, #endif /* generate flame spectrum texture */ - #define SPEC_WIDTH 256 - #define FIRE_THRESH 7 - #define MAX_FIRE_ALPHA 0.06f - #define FULL_ON_FIRE 100 +#define SPEC_WIDTH 256 +#define FIRE_THRESH 7 +#define MAX_FIRE_ALPHA 0.06f +#define FULL_ON_FIRE 100 spec_data = malloc(SPEC_WIDTH * 4 * sizeof(unsigned char)); flame_get_spectrum(spec_data, SPEC_WIDTH, 1500, 3000); spec_pixels = malloc(SPEC_WIDTH * 4 * 16 * 16 * sizeof(float)); @@ -271,6 +271,11 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob, tex_spec = GPU_texture_create_1D(SPEC_WIDTH, spec_pixels, NULL); +#undef SPEC_WIDTH +#undef FIRE_THRESH +#undef MAX_FIRE_ALPHA +#undef FULL_ON_FIRE + sub_v3_v3v3(size, max, min); /* maxx, maxy, maxz */ |