[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57806] trunk/blender: fix for zero length normalize before scanfill for meshes and other minor changes .

Campbell Barton ideasman42 at gmail.com
Thu Jun 27 06:32:44 CEST 2013


Revision: 57806
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57806
Author:   campbellbarton
Date:     2013-06-27 04:32:44 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
fix for zero length normalize before scanfill for meshes and other minor changes.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/source/blender/blenkernel/intern/mesh.c
    trunk/blender/source/blender/editors/curve/editfont.c

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2013-06-27 04:18:01 UTC (rev 57805)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2013-06-27 04:32:44 UTC (rev 57806)
@@ -773,6 +773,7 @@
         row.prop(light, "ao_factor", text="Factor")
         row.prop(light, "distance", text="Distance")
 
+
 class CyclesWorld_PT_mist(CyclesButtonsPanel, Panel):
     bl_label = "Mist Pass"
     bl_context = "world"
@@ -940,7 +941,7 @@
         col = split.column(align=True)
         col.label()
         col.prop(mat, "pass_index")
-        
+
         col = layout.column()
         col.prop(cmat, "sample_as_light")
         col.prop(cmat, "use_transparent_shadow")
@@ -1166,7 +1167,7 @@
 
             row = layout.row()
             row.prop(ccscene, "use_parents", text="Include parents")
-        
+
         row = layout.row()
         row.prop(ccscene, "minimum_width", text="Min Pixels")
         row.prop(ccscene, "maximum_width", text="Max Ext.")
@@ -1198,7 +1199,7 @@
         row = layout.row()
         row.prop(cpsys, "root_width", text="Root")
         row.prop(cpsys, "tip_width", text="Tip")
-        
+
         row = layout.row()
         row.prop(cpsys, "radius_scale", text="Scaling")
         row.prop(cpsys, "use_closetip", text="Close tip")

Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c	2013-06-27 04:18:01 UTC (rev 57805)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c	2013-06-27 04:32:44 UTC (rev 57806)
@@ -2765,7 +2765,9 @@
 			BLI_scanfill_edge_add(&sf_ctx, sf_vert_last, sf_vert_first);
 #ifdef USE_TESSFACE_CALCNORMAL
 			add_newell_cross_v3_v3v3(normal, sf_vert_last->co, sf_vert_first->co);
-			normalize_v3(normal);
+			if (UNLIKELY(normalize_v3(normal) == 0.0f)) {
+				normal[2] = 1.0f;
+			}
 			totfilltri = BLI_scanfill_calc_ex(&sf_ctx, 0, normal);
 #else
 			totfilltri = BLI_scanfill_calc(&sf_ctx, 0);

Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c	2013-06-27 04:18:01 UTC (rev 57805)
+++ trunk/blender/source/blender/editors/curve/editfont.c	2013-06-27 04:32:44 UTC (rev 57806)
@@ -299,7 +299,7 @@
 	Object *obedit = CTX_data_edit_object(C);
 	const char *p, *p2;
 	int i;
-	static const char *lastlorem;
+	static const char *lastlorem = NULL;
 	
 	if (lastlorem)
 		p = lastlorem;




More information about the Bf-blender-cvs mailing list