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

[Diego Borghetti (Plumiferos)]

Revision: 11482
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11482
Author:   bdiego
Date:     2007-08-04 01:51:51 +0200 (Sat, 04 Aug 2007)

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

Merge from trunk:
	revision 11476
	revision 11478
	revision 11481

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11476
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11478
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11481

Modified Paths:
--------------
    branches/2-44-stable/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
    branches/2-44-stable/blender/source/blender/src/editarmature.c
    branches/2-44-stable/blender/source/blender/src/editipo.c
    branches/2-44-stable/blender/source/blender/src/transform_generics.c

Modified: branches/2-44-stable/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
===================================================================
--- branches/2-44-stable/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h	2007-08-03 21:34:13 UTC (rev 11481)
+++ branches/2-44-stable/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h	2007-08-03 23:51:51 UTC (rev 11482)
@@ -125,7 +125,8 @@
 	
 	BSP_CSGMesh_VertexIt * v_it = new BSP_CSGMesh_VertexIt;
 	v_it->mesh = mesh;
-	v_it->pos = &mesh->VertexSet()[0];
+	if( output->num_elements > 0 )
+		v_it->pos = &mesh->VertexSet()[0];
 	output->it = v_it;
 };			
 
@@ -257,11 +258,11 @@
 	
 	BSP_CSGMesh_FaceIt * f_it = new BSP_CSGMesh_FaceIt;
 	f_it->mesh = mesh;
-	f_it->pos = &mesh->FaceSet()[0];
+	if( output->num_elements > 0 )
+		f_it->pos = &mesh->FaceSet()[0];
 	f_it->face_triangle = 0;
 
 	output->it = f_it;
-
 };
 
 

Modified: branches/2-44-stable/blender/source/blender/src/editarmature.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/editarmature.c	2007-08-03 21:34:13 UTC (rev 11481)
+++ branches/2-44-stable/blender/source/blender/src/editarmature.c	2007-08-03 23:51:51 UTC (rev 11482)
@@ -2817,6 +2817,7 @@
 				}
 				if(ebo->flag & BONE_SELECTED) {
 					eboflip->dist= ebo->dist;
+					eboflip->roll= -ebo->roll;
 					eboflip->xwidth= ebo->xwidth;
 					eboflip->zwidth= ebo->zwidth;
 				}

Modified: branches/2-44-stable/blender/source/blender/src/editipo.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/editipo.c	2007-08-03 21:34:13 UTC (rev 11481)
+++ branches/2-44-stable/blender/source/blender/src/editipo.c	2007-08-03 23:51:51 UTC (rev 11482)
@@ -4532,7 +4532,7 @@
 		if (OBACT && OBACT->action && G.sipo->pin==0 && G.sipo->actname) {
 			tv->oldloc[0] = get_action_frame_inv(OBACT, tv->loc[0]);
 			tv->oldloc[0]-= dvec[0];
-			tv->oldloc[0] = get_action_frame(OBACT, tv->loc[0]);
+			tv->oldloc[0] = get_action_frame(OBACT, tv->oldloc[0]);
 		}
 		else {
 			tv->oldloc[0]= tv->loc[0]-dvec[0];

Modified: branches/2-44-stable/blender/source/blender/src/transform_generics.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/transform_generics.c	2007-08-03 21:34:13 UTC (rev 11481)
+++ branches/2-44-stable/blender/source/blender/src/transform_generics.c	2007-08-03 23:51:51 UTC (rev 11482)
@@ -403,6 +403,7 @@
 	case TFM_CREASE:
 	case TFM_BONE_ENVELOPE:
 	case TFM_CURVE_SHRINKFATTEN:
+	case TFM_BONE_ROLL:
 		t->flag |= T_NO_CONSTRAINT;
 		break;
 	}