diff options
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/drawanimviz.c | 5 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawvolume.c | 13 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 4 |
3 files changed, 14 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index 902a9976f48..82e85e3a449 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -147,7 +147,7 @@ void draw_motion_path_instance(Scene *scene, * - black for before current frame, green for current frame, blue for after current frame * - intensity decreases as distance from current frame increases */ - #define SET_INTENSITY(A, B, C, min, max) (((1.0f - ((C - B) / (C - A))) * (max - min)) + min) +#define SET_INTENSITY(A, B, C, min, max) (((1.0f - ((C - B) / (C - A))) * (max - min)) + min) if (frame < CFRA) { /* black - before cfra */ if (sel) { @@ -182,7 +182,8 @@ void draw_motion_path_instance(Scene *scene, } UI_ThemeColorBlendShade(TH_CFRAME, TH_BACK, intensity, 10); } - +#undef SET_INTENSITY + /* draw a vertex with this color */ glVertex3fv(mpv->co); } 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 */ diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 36c6df75461..ab9a222b96a 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3440,14 +3440,14 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) rv3d->lpersp = rv3d->persp; } - #if 0 +#if 0 if (G.qual == LR_ALTKEY) { if (oldcamera && is_an_active_object(oldcamera)) { v3d->camera = oldcamera; } handle_view3d_lock(); } - #endif +#endif /* first get the default camera for the view lock type */ if (v3d->scenelock) { |