[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58448] trunk/blender: misc edits

Campbell Barton ideasman42 at gmail.com
Sat Jul 20 17:07:57 CEST 2013


Revision: 58448
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58448
Author:   campbellbarton
Date:     2013-07-20 15:07:57 +0000 (Sat, 20 Jul 2013)
Log Message:
-----------
misc edits
- fix for missing None check with recent 'Hidden Wire' draw option.
- avoid int overflow with mesh selection.
- remove ';' outside of functions.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
    trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
    trunk/blender/source/blender/editors/mask/mask_select.c
    trunk/blender/source/blender/editors/mesh/editmesh_select.c
    trunk/blender/source/blender/editors/mesh/meshtools.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
    trunk/blender/source/blender/imbuf/intern/jpeg.c
    trunk/blender/source/blender/makesrna/intern/rna_mesh.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-07-20 14:58:22 UTC (rev 58447)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2013-07-20 15:07:57 UTC (rev 58448)
@@ -2540,7 +2540,7 @@
         view = context.space_data
         scene = context.scene
         gs = scene.game_settings
-        ob = context.object
+        obj = context.object
 
         col = layout.column()
         col.prop(view, "show_only_render")
@@ -2580,7 +2580,7 @@
             if view.use_matcap:
                 col.template_icon_view(view, "matcap_icon")
         col.prop(view, "show_backface_culling")
-        if ob.mode == 'EDIT' and view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'}:
+        if obj and obj.mode == 'EDIT' and view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'}:
             col.prop(view, "show_occlude_wire")
 
         layout.separator()

Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c	2013-07-20 14:58:22 UTC (rev 58447)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c	2013-07-20 15:07:57 UTC (rev 58448)
@@ -72,7 +72,7 @@
 /* optimization, ensure we stay small */
 BLI_STATIC_ASSERT((sizeof(void *) == 8 && sizeof(BVHTree) <= 48) ||
                   (sizeof(void *) == 4 && sizeof(BVHTree) <= 32),
-                  "over sized");
+                  "over sized")
 
 typedef struct BVHOverlapData {
 	BVHTree *tree1, *tree2; 
@@ -603,6 +603,7 @@
 	data->branches_on_level[0] = 1;
 
 	/* We could stop the loop first (but I am lazy to find out when) */
+	/* note: this often causes integer overflow, may be worth avoiding? - campbell */
 	for (depth = 1; depth < 32; depth++) {
 		data->branches_on_level[depth] = data->branches_on_level[depth - 1] * data->tree_type;
 		data->leafs_per_child[depth] = data->leafs_per_child[depth - 1] / data->tree_type;

Modified: trunk/blender/source/blender/editors/mask/mask_select.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_select.c	2013-07-20 14:58:22 UTC (rev 58447)
+++ trunk/blender/source/blender/editors/mask/mask_select.c	2013-07-20 15:07:57 UTC (rev 58448)
@@ -812,12 +812,12 @@
 			int i;
 			bool start_sel, end_sel, prev_sel, cur_sel, cyclic = spline->flag & MASK_SPLINE_CYCLIC;
 
-			// reselect point if any handle is selected to make the result more predictable
+			/* reselect point if any handle is selected to make the result more predictable */
 			for (i = 0; i < spline->tot_point; i++) {
 				BKE_mask_point_select_set(spline->points + i, MASKPOINT_ISSEL_ANY(spline->points + i));
 			}
 
-			// select more/less does not affect empty/single point splines
+			/* select more/less does not affect empty/single point splines */
 			if (spline->tot_point < 2) {
 				continue;
 			}

Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c	2013-07-20 14:58:22 UTC (rev 58447)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c	2013-07-20 15:07:57 UTC (rev 58448)
@@ -460,7 +460,7 @@
 			                                   0, NULL, NULL);
 		}
 		
-		eve = BM_vert_at_index(vc->em->bm, index - 1);
+		eve = index ? BM_vert_at_index(vc->em->bm, index - 1) : NULL;
 		
 		if (eve && distance < *r_dist) {
 			*r_dist = distance;
@@ -552,7 +552,7 @@
 		view3d_validate_backbuf(vc);
 		
 		index = view3d_sample_backbuf_rect(vc, vc->mval, 50, bm_solidoffs, bm_wireoffs, &distance, 0, NULL, NULL);
-		eed = BM_edge_at_index(vc->em->bm, index - 1);
+		eed = index ? BM_edge_at_index(vc->em->bm, index - 1) : NULL;
 		
 		if (eed && distance < *r_dist) {
 			*r_dist = distance;
@@ -625,7 +625,7 @@
 		view3d_validate_backbuf(vc);
 
 		index = view3d_sample_backbuf(vc, vc->mval[0], vc->mval[1]);
-		efa = BM_face_at_index(vc->em->bm, index - 1);
+		efa = index ? BM_face_at_index(vc->em->bm, index - 1) : NULL;
 		
 		if (efa) {
 			struct { float mval_fl[2]; float dist; BMFace *toFace; } data;

Modified: trunk/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/meshtools.c	2013-07-20 14:58:22 UTC (rev 58447)
+++ trunk/blender/source/blender/editors/mesh/meshtools.c	2013-07-20 15:07:57 UTC (rev 58448)
@@ -1200,7 +1200,7 @@
 		*index = view3d_sample_backbuf(&vc, mval[0], mval[1]);
 	}
 
-	if ((*index) <= 0 || (*index) > (unsigned int)me->totpoly)
+	if ((*index) == 0 || (*index) > (unsigned int)me->totpoly)
 		return false;
 
 	(*index)--;
@@ -1321,7 +1321,7 @@
 			*index = view3d_sample_backbuf(&vc, mval[0], mval[1]);
 		}
 
-		if ((*index) <= 0 || (*index) > (unsigned int)me->totvert)
+		if ((*index) == 0 || (*index) > (unsigned int)me->totvert)
 			return false;
 
 		(*index)--;

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c	2013-07-20 14:58:22 UTC (rev 58447)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c	2013-07-20 15:07:57 UTC (rev 58448)
@@ -333,7 +333,7 @@
 	/* sample only on the exact position */
 	*index = view3d_sample_backbuf(vc, mval[0], mval[1]);
 
-	if ((*index) <= 0 || (*index) > (unsigned int)totface) {
+	if ((*index) == 0 || (*index) > (unsigned int)totface) {
 		return 0;
 	}
 

Modified: trunk/blender/source/blender/imbuf/intern/jpeg.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jpeg.c	2013-07-20 14:58:22 UTC (rev 58447)
+++ trunk/blender/source/blender/imbuf/intern/jpeg.c	2013-07-20 15:07:57 UTC (rev 58448)
@@ -61,7 +61,7 @@
 /* the types are from the jpeg lib */
 static void jpeg_error(j_common_ptr cinfo)
 #ifdef __GNUC__
-__attribute__((noreturn));
+__attribute__((noreturn))
 #endif
 ;
 static void init_source(j_decompress_ptr cinfo);

Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c	2013-07-20 14:58:22 UTC (rev 58447)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c	2013-07-20 15:07:57 UTC (rev 58448)
@@ -972,7 +972,7 @@
 }
 
 /* Skin vertices */
-DEFINE_CUSTOMDATA_LAYER_COLLECTION(skin_vertice, vdata, CD_MVERT_SKIN);
+DEFINE_CUSTOMDATA_LAYER_COLLECTION(skin_vertice, vdata, CD_MVERT_SKIN)
 
 static char *rna_MeshSkinVertexLayer_path(PointerRNA *ptr)
 {




More information about the Bf-blender-cvs mailing list