[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56609] trunk/blender: fix for 2 errors introduced since release

[Campbell Barton]

Revision: 56609
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56609
Author:   campbellbarton
Date:     2013-05-09 07:02:51 +0000 (Thu, 09 May 2013)
Log Message:
-----------
fix for 2 errors introduced since release
- shape key NULL pointer dereference.
- use uninitialized variable for bmesh free.

also update credits and merge dissolve flag assignment. 

Modified Paths:
--------------
    trunk/blender/intern/tools/credits_svn_gen.py
    trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
    trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
    trunk/blender/source/blender/editors/object/object_relations.c
    trunk/blender/source/blender/editors/object/object_shapekey.c

Modified: trunk/blender/intern/tools/credits_svn_gen.py
===================================================================
--- trunk/blender/intern/tools/credits_svn_gen.py	2013-05-09 02:50:59 UTC (rev 56608)
+++ trunk/blender/intern/tools/credits_svn_gen.py	2013-05-09 07:02:51 UTC (rev 56609)
@@ -199,6 +199,7 @@
     "ianwill": "Willian Padovani Germano",
     "imbusy": "Lukas Steiblys",
     "intrr": "Alexander Ewering",
+    "irie": "Irie Shinsuke",
     "jaguarandi": "Andre Susano Pinto",
     "jandro": "Alejandro Conty Estevez",
     "jason_hays22": "Jason Hays",
@@ -216,6 +217,7 @@
     "keir": "Keir Mierle",
     "kester": "Kester Maddock",
     "khughes": "Ken Hughes",
+    "kjym3": "Tamito Kajiyama",
     "kupoman": "Daniel Stokes",
     "kwk": "Konrad Kleine",
     "larstiq": "Wouter van Heyst",
@@ -663,7 +665,7 @@
 
 def main():
     main_credits()
-    main_credits(min_rev_bfb=52851, min_rev_ext=4072)
+    main_credits(min_rev_bfb=54697, min_rev_ext=4315)
 
 if __name__ == "__main__":
     main()

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c	2013-05-09 02:50:59 UTC (rev 56608)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c	2013-05-09 07:02:51 UTC (rev 56609)
@@ -168,10 +168,9 @@
 	BMIter iter;
 	BMIter itersub;
 
-	bool is_ldata_free;
-	bool is_pdata_free;
+	const bool is_ldata_free = CustomData_bmesh_has_free(&bm->ldata);
+	const bool is_pdata_free = CustomData_bmesh_has_free(&bm->pdata);
 
-
 	/* Check if we have to call free, if not we can avoid a lot of looping */
 	if (CustomData_bmesh_has_free(&(bm->vdata))) {
 		BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
@@ -184,9 +183,7 @@
 		}
 	}
 
-	if ((is_ldata_free = CustomData_bmesh_has_free(&(bm->ldata))) ||
-	    (is_pdata_free = CustomData_bmesh_has_free(&(bm->pdata))))
-	{
+	if (is_ldata_free || is_pdata_free) {
 		BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
 			if (is_pdata_free)
 				CustomData_bmesh_free_block(&(bm->pdata), &(f->head.data));

Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c	2013-05-09 02:50:59 UTC (rev 56608)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c	2013-05-09 07:02:51 UTC (rev 56609)
@@ -403,8 +403,7 @@
 			}
 
 			BM_ITER_ELEM (f, &fiter, v, BM_FACES_OF_VERT) {
-				BMO_elem_flag_enable(bm, f, FACE_ORIG);
-				BMO_elem_flag_enable(bm, f, FACE_MARK);
+				BMO_elem_flag_enable(bm, f, FACE_MARK | FACE_ORIG);
 			}
 			
 			/* check if our additions to the input to face dissolve
@@ -412,8 +411,7 @@
 			if (!test_extra_verts(bm, v)) {
 				BM_ITER_ELEM (f, &fiter, v, BM_FACES_OF_VERT) {
 					if (BMO_elem_flag_test(bm, f, FACE_ORIG)) {
-						BMO_elem_flag_disable(bm, f, FACE_MARK);
-						BMO_elem_flag_disable(bm, f, FACE_ORIG);
+						BMO_elem_flag_disable(bm, f, FACE_MARK | FACE_ORIG);
 					}
 				}
 			}

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c	2013-05-09 02:50:59 UTC (rev 56608)
+++ trunk/blender/source/blender/editors/object/object_relations.c	2013-05-09 07:02:51 UTC (rev 56609)
@@ -145,7 +145,7 @@
 
 		/* derivedMesh might be needed for solving parenting,
 		 * so re-create it here */
-		makeDerivedMesh(scene, obedit, em, CD_MASK_BAREMESH|CD_MASK_ORIGINDEX, 0);
+		makeDerivedMesh(scene, obedit, em, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX, 0);
 
 		BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
 			if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {

Modified: trunk/blender/source/blender/editors/object/object_shapekey.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_shapekey.c	2013-05-09 02:50:59 UTC (rev 56608)
+++ trunk/blender/source/blender/editors/object/object_shapekey.c	2013-05-09 07:02:51 UTC (rev 56609)
@@ -458,11 +458,11 @@
 		}
 
 		SWAP(float, kb_other->pos, kb->pos); /* for absolute shape keys */
+
+		/* First key is refkey, matches interface and BKE_key_sort */
+		key->refkey = key->block.first;
 	}
 
-	/* First key is refkey, matches interface and BKE_key_sort  */
-	key->refkey = key->block.first;
-
 	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);