[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10930] branches/2-44-stable/blender/ source/blender: branches/2-44-stable

Diego Borghetti (Plumiferos) bdiego at gmail.com
Thu Jun 14 20:38:33 CEST 2007


Revision: 10930
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10930
Author:   bdiego
Date:     2007-06-14 20:38:33 +0200 (Thu, 14 Jun 2007)

Log Message:
-----------
branches/2-44-stable

revision 10719:10720 (Bugfix: #6698)
	Wrong hotkey given in for the Remove Doubles entry in the
	3d-view toolbox->edit->vertices menu
	Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10720

revision 10720:10721 
	Python bugfix reported by reD_Fox1
	Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10721

revision 10721:10722
	Fixed the "Enable modifier during editmode" button for the case
	when there are only deform modifiers in the stack.
	Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10722

revision 10722:10723 
	Fixed editmode post-modifier normal calculation for the
	case where there are only deform modifiers in the stack.
	Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10723

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10719
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10720
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10721
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10722

Modified Paths:
--------------
    branches/2-44-stable/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/2-44-stable/blender/source/blender/python/api2_2x/Object.c
    branches/2-44-stable/blender/source/blender/src/toolbox.c

Modified: branches/2-44-stable/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/2-44-stable/blender/source/blender/blenkernel/intern/DerivedMesh.c	2007-06-14 16:36:05 UTC (rev 10929)
+++ branches/2-44-stable/blender/source/blender/blenkernel/intern/DerivedMesh.c	2007-06-14 18:38:33 UTC (rev 10930)
@@ -983,7 +983,7 @@
 			float *no = emdm->faceNos[i];
 			
 			if(efa->v4) {
-				float *v4 = vertexCos[(int) efa->v3->tmp.l];
+				float *v4 = vertexCos[(int) efa->v4->tmp.l];
 
 				CalcNormFloat4(v1, v2, v3, v4, no);
 				VecAddf(emdm->vertexNos[(int) efa->v4->tmp.l], emdm->vertexNos[(int) efa->v4->tmp.l], no);
@@ -2024,7 +2024,7 @@
 		CDDM_calc_normals(*final_r);
 	} else if (dm) {
 		*final_r = dm;
-	} else if (cage_r && *cage_r) {
+	} else if (!deformedVerts && cage_r && *cage_r) {
 		*final_r = *cage_r;
 	} else {
 		*final_r = getEditMeshDerivedMesh(em, ob, deformedVerts);

Modified: branches/2-44-stable/blender/source/blender/python/api2_2x/Object.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/api2_2x/Object.c	2007-06-14 16:36:05 UTC (rev 10929)
+++ branches/2-44-stable/blender/source/blender/python/api2_2x/Object.c	2007-06-14 18:38:33 UTC (rev 10930)
@@ -2681,11 +2681,16 @@
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "expected an object argument" );
 
-	if( self->object->type != object->object->type )
+	if( !object->object->data )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
+					      "Object argument has no data linked yet or is an empty" );
+	
+	if( self->object->type != object->object->type &&
+		self->realtype != object->object->type)
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
 					      "objects are not of same data type" );
 
-	switch ( self->object->type ) {
+	switch ( object->object->type ) {
 	case OB_MESH:
 	case OB_LAMP:
 	case OB_CAMERA:	/* we can probably add the other types, too */
@@ -2693,6 +2698,13 @@
 	case OB_CURVE:
 	case OB_SURF:
 	case OB_LATTICE:
+		
+		/* if this object had no data, we need to enable the realtype */
+		if (self->object->type == OB_EMPTY) {
+			self->object->type= self->realtype;
+			self->realtype = OB_EMPTY;
+		}
+	
 		oldid = ( ID * ) self->object->data;
 		id = ( ID * ) object->object->data;
 		self->object->data = object->object->data;
@@ -2711,6 +2723,7 @@
 					   "old object reference count below 0" );
 			}
 		}
+		
 		Py_RETURN_NONE;
 	default:
 		return EXPP_ReturnPyObjError( PyExc_ValueError,

Modified: branches/2-44-stable/blender/source/blender/src/toolbox.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/toolbox.c	2007-06-14 16:36:05 UTC (rev 10929)
+++ branches/2-44-stable/blender/source/blender/src/toolbox.c	2007-06-14 18:38:33 UTC (rev 10930)
@@ -1012,7 +1012,7 @@
 {	0, "Separate|P", 			3, 		NULL},
 {	0, "SEPR",					0, NULL},
 {	0, "Smooth|W, Alt 1", 			2, NULL},
-{	0, "Remove Doubles|W, 5", 			1, NULL},
+{	0, "Remove Doubles|W, 6", 			1, NULL},
 {	0, "SEPR",					0, NULL},
 {	0, "Make Vertex Parent|Ctrl P", 	0, NULL},
 {	0, "Add Hook|Ctrl H",		6, NULL},





More information about the Bf-blender-cvs mailing list