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

skip fix from r54579 when holes aren't used (keeps bmesh ngon filling fast)

Browse Source
This commit is contained in:
Campbell Barton 2013-02-15 12:57:11 +00:00
parent 964c35771c
commit 7fa256815f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenlib/intern/scanfill.c
View File

@ -682,7 +682,7 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag)
ScanFillVertLink *best_sc = NULL;
float best_angle = 3.14f;
float miny;
int firsttime = 0;
bool firsttime = false;
v1 = ed1->v2;
v2 = ed1->v1;
@ -706,15 +706,20 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag)
/* because multiple points can be inside triangle (concave holes) */
/* we continue searching and pick the one with sharpest corner */
if (best_sc == NULL)
if (best_sc == NULL) {
best_sc = sc1;
/* only need to continue checking with holes */
if ((flag & BLI_SCANFILL_CALC_HOLES) == 0) {
break;
}
}
else {
float angle;
/* prevent angle calc for the simple cases only 1 vertex is found */
if (firsttime == 0) {
if (firsttime == false) {
best_angle = angle_v2v2v2(v2->co, v1->co, best_sc->vert->co);
firsttime = 1;
firsttime = true;
}
angle = angle_v2v2v2(v2->co, v1->co, sc1->vert->co);

2
source/blender/nodes/shader/nodes/node_shader_brightness.c
View File

@ -43,7 +43,7 @@ static bNodeSocketTemplate sh_node_brightcontrast_out[] = {
{ -1, 0, "" }
};
static int gpu_shader_brightcontrast(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
static int gpu_shader_brightcontrast(GPUMaterial *mat, bNode *UNUSED(node), GPUNodeStack *in, GPUNodeStack *out)
{
return GPU_stack_link(mat, "brightness_contrast", in, out);
}