sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton 2013-05-18 11:37:49 +00:00
parent 423ffa6043
commit ac2fa65dd9
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/animation/anim_draw.c
View File

@ -262,9 +262,9 @@ void ANIM_draw_previewrange(const bContext *C, View2D *v2d, int end_frame_width)
glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
/* only draw two separate 'curtains' if there's no overlap between them */
if (PSFRA < PEFRA+end_frame_width) {
if (PSFRA < PEFRA + end_frame_width) {
glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
glRectf((float)(PEFRA+end_frame_width), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
glRectf((float)(PEFRA + end_frame_width), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
}
else {
glRectf(v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);

14
source/blender/editors/sculpt_paint/paint_stroke.c
View File

@ -389,17 +389,17 @@ static float paint_space_stroke_spacing_variable(const Scene *scene, PaintStroke
* are aligned nicely with no overlap. for this the spacing needs to be
* the average of the previous and next size. */
float s = paint_space_stroke_spacing(scene, stroke, 1.0f, pressure);
float q = s*dpressure/(2.0f*length);
float pressure_fac = (1.0f + q)/(1.0f - q);
float q = s * dpressure / (2.0f * length);
float pressure_fac = (1.0f + q) / (1.0f - q);
float last_size_pressure = stroke->last_pressure;
float new_size_pressure = stroke->last_pressure*pressure_fac;
float new_size_pressure = stroke->last_pressure * pressure_fac;
/* average spacing */
float last_spacing = paint_space_stroke_spacing(scene, stroke, last_size_pressure, pressure);
float new_spacing = paint_space_stroke_spacing(scene, stroke, new_size_pressure, pressure);
return 0.5f*(last_spacing + new_spacing);
return 0.5f * (last_spacing + new_spacing);
}
else {
/* no size pressure */
@ -432,9 +432,9 @@ static int paint_space_stroke(bContext *C, wmOperator *op, const float final_mou
float spacing = paint_space_stroke_spacing_variable(scene, stroke, pressure, dpressure, length);
if (length >= spacing) {
mouse[0] = stroke->last_mouse_position[0] + dmouse[0]*spacing;
mouse[1] = stroke->last_mouse_position[1] + dmouse[1]*spacing;
pressure = stroke->last_pressure + (spacing/length)*dpressure;
mouse[0] = stroke->last_mouse_position[0] + dmouse[0] * spacing;
mouse[1] = stroke->last_mouse_position[1] + dmouse[1] * spacing;
pressure = stroke->last_pressure + (spacing / length) * dpressure;
paint_brush_stroke_add_step(C, op, mouse, pressure);

2
source/blender/editors/space_sequencer/sequencer_draw.c
View File

@ -1381,7 +1381,7 @@ static void seq_draw_sfra_efra(Scene *scene, View2D *v2d)
* frame range used is preview range or scene range */
UI_ThemeColorShadeAlpha(TH_BACK, -25, -100);
if (PSFRA < PEFRA+1) {
if (PSFRA < PEFRA + 1) {
glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
glRectf((float)(PEFRA + 1), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
}