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

remove brush_sample_falloff, #if 0, unused function is_tablet_cursor

Browse Source
This commit is contained in:
Campbell Barton 2009-09-18 03:41:37 +00:00
parent 985031c235
commit fd6654d4ef
3 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/intern/GHOST_WindowX11.cpp
View File

@ -450,7 +450,7 @@ static bool match_token(const char *haystack, const char *needle)
** Wacoms x11 config "cursor" refers to its device slot (which we mirror with
** our gSysCursors) for puck like devices (tablet mice essentially).
*/
#if 0 // unused
static BOOL is_tablet_cursor(const char *name, const char *type)
{
int i;
@ -474,7 +474,7 @@ static BOOL is_tablet_cursor(const char *name, const char *type)
}
return FALSE;
}
#endif
static BOOL is_stylus(const char *name, const char *type)
{
int i;

1
source/blender/blenkernel/BKE_brush.h
View File

@ -63,7 +63,6 @@ void brush_curve_preset(struct Brush *b, BrushCurvePreset preset);
float brush_curve_strength(struct Brush *br, float p, const float len);
/* sampling */
float brush_sample_falloff(struct Brush *brush, float dist);
void brush_sample_tex(struct Brush *brush, float *xy, float *rgba);
void brush_imbuf_new(struct Brush *brush, short flt, short texfalloff, int size,
struct ImBuf **imbuf);

30
source/blender/blenkernel/intern/brush.c
View File

@ -379,36 +379,6 @@ void brush_check_exists(Brush **brush, const char *name)
}
/* Brush Sampling */
/*static float taylor_approx_cos(float f)
{
f = f*f;
f = 1.0f - f/2.0f + f*f/24.0f;
return f;
}*/
float brush_sample_falloff(Brush *brush, float dist)
{
float a, outer, inner;
outer = brush->size >> 1;
inner = outer*brush->innerradius;
if (dist <= inner) {
return brush->alpha;
}
else if ((dist < outer) && (inner < outer)) {
a = sqrt((dist - inner)/(outer - inner));
return (1 - a)*brush->alpha;
/* formula used by sculpt, with taylor approx
a = 0.5f*(taylor_approx_cos(3.0f*(dist - inner)/(outer - inner)) + 1.0f);
return a*brush->alpha; */
}
else
return 0.0f;
}
void brush_sample_tex(Brush *brush, float *xy, float *rgba)
{
MTex *mtex= brush->mtex[brush->texact];