diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-01 07:56:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-01 07:56:02 +0400 |
| commit | 92527b9264c8cca99282e7d7a2368dbf17aa4605 (patch) | |
| tree | dfc9480f523a9ad72e8577920f200afed81be94a | |
| parent | 6067fa682b0c70778f614ab68af20455befe5a76 (diff) | |
remove assert for poly_find_ear(), added recently but its incorrect, also minor style edits.
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 6 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 3 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index d98a6cbe0cc..6c2fe2daac7 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -123,11 +123,11 @@ void init_tex_mapping(TexMapping *texmap) if (ELEM(texmap->type, TEXMAP_TYPE_TEXTURE, TEXMAP_TYPE_NORMAL)) { /* keep matrix invertible */ - if(fabsf(size[0]) < 1e-5f) + if (fabsf(size[0]) < 1e-5f) size[0] = signf(size[0])*1e-5f; - if(fabsf(size[1]) < 1e-5f) + if (fabsf(size[1]) < 1e-5f) size[1] = signf(size[1])*1e-5f; - if(fabsf(size[2]) < 1e-5f) + if (fabsf(size[2]) < 1e-5f) size[2] = signf(size[2])*1e-5f; } diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 2492dce05c7..0978faee9e4 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -865,7 +865,6 @@ static BMLoop *poly_find_ear(BMFace *f, float (*projectverts)[2], const bool use const float cos_threshold = 0.9f; const float bias = 1.0f + 1e-6f; - BLI_assert(BM_face_is_normal_valid(f)); /* just triangulate degenerate faces */ if (UNLIKELY(is_zero_v3(f->no))) { return BM_FACE_FIRST_LOOP(f); diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index d04639f95e7..553a543390f 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -877,7 +877,8 @@ static int freestyle_linestyle_new_exec(bContext *C, wmOperator *op) if (lineset->linestyle) { lineset->linestyle->id.us--; lineset->linestyle = BKE_copy_linestyle(lineset->linestyle); - } else { + } + else { lineset->linestyle = BKE_new_linestyle("LineStyle", NULL); } diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 9319ac53db6..ed7a2f4ede0 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -1126,10 +1126,12 @@ static void do_material_tex(GPUShadeInput *shi) else { /* otherwise use accumulated perturbations */ GPU_link(mat, "mtex_nspace_tangent", GPU_attribute(CD_TANGENT, ""), shi->vn, tnor, &newnor); } - } else if (mtex->normapspace == MTEX_NSPACE_OBJECT) { + } + else if (mtex->normapspace == MTEX_NSPACE_OBJECT) { /* transform normal by object then view matrix */ GPU_link(mat, "mtex_nspace_object", GPU_builtin(GPU_VIEW_MATRIX), GPU_builtin(GPU_OBJECT_MATRIX), tnor, &newnor); - } else if (mtex->normapspace == MTEX_NSPACE_WORLD) { + } + else if (mtex->normapspace == MTEX_NSPACE_WORLD) { /* transform normal by view matrix */ GPU_link(mat, "mtex_nspace_world", GPU_builtin(GPU_VIEW_MATRIX), tnor, &newnor); } |