blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

branches/2-44-stable 

Merge from trunk:
	revision 11476
	revision 11478
	revision 11481
This commit is contained in:
Diego Borghetti 2007-08-03 23:51:51 +00:00
parent 0cb8f80f6f
commit d491dc7561
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
intern/bsp/intern/BSP_CSGMesh_CFIterator.h
View File

@ -125,7 +125,8 @@ BSP_CSGMeshVertexIt_Construct(
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_Construct(
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;
};

1
source/blender/src/editarmature.c
View File

@ -2817,6 +2817,7 @@ void transform_armature_mirror_update(void)
}
if(ebo->flag & BONE_SELECTED) {
eboflip->dist= ebo->dist;
eboflip->roll= -ebo->roll;
eboflip->xwidth= ebo->xwidth;
eboflip->zwidth= ebo->zwidth;
}

2
source/blender/src/editipo.c
View File

@ -4532,7 +4532,7 @@ void remake_ipo_transverts(TransVert *transmain, float *dvec, int tot)
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];

1
source/blender/src/transform_generics.c
View File

@ -403,6 +403,7 @@ void initTransModeFlags(TransInfo *t, int mode)
case TFM_CREASE:
case TFM_BONE_ENVELOPE:
case TFM_CURVE_SHRINKFATTEN:
case TFM_BONE_ROLL:
t->flag |= T_NO_CONSTRAINT;
break;
}