[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60463] trunk/blender/source/blender: remove assert for poly_find_ear(), added recently but its incorrect, also minor style edits.

[Campbell Barton]

Revision: 60463
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60463
Author:   campbellbarton
Date:     2013-10-01 03:56:02 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
remove assert for poly_find_ear(), added recently but its incorrect, also minor style edits.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/texture.c
    trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
    trunk/blender/source/blender/editors/render/render_shading.c
    trunk/blender/source/blender/gpu/intern/gpu_material.c

Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c	2013-10-01 02:51:39 UTC (rev 60462)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c	2013-10-01 03:56:02 UTC (rev 60463)
@@ -123,11 +123,11 @@
 
 		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;
 		}
 		

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c	2013-10-01 02:51:39 UTC (rev 60462)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c	2013-10-01 03:56:02 UTC (rev 60463)
@@ -865,7 +865,6 @@
 	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);

Modified: trunk/blender/source/blender/editors/render/render_shading.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_shading.c	2013-10-01 02:51:39 UTC (rev 60462)
+++ trunk/blender/source/blender/editors/render/render_shading.c	2013-10-01 03:56:02 UTC (rev 60463)
@@ -877,7 +877,8 @@
 	if (lineset->linestyle) {
 		lineset->linestyle->id.us--;
 		lineset->linestyle = BKE_copy_linestyle(lineset->linestyle);
-	} else {
+	}
+	else {
 		lineset->linestyle = BKE_new_linestyle("LineStyle", NULL);
 	}
 

Modified: trunk/blender/source/blender/gpu/intern/gpu_material.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_material.c	2013-10-01 02:51:39 UTC (rev 60462)
+++ trunk/blender/source/blender/gpu/intern/gpu_material.c	2013-10-01 03:56:02 UTC (rev 60463)
@@ -1126,10 +1126,12 @@
 							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);
 						}