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

branches/2-44-stable 

revision 11275 (BugFix #6915)
revision 11279
revision 11286 (BugFix #6945)
revision 11288
revision 11289 (BugFix #6831)
revision 11292

All are small fix, i wanna avoid big change now that we are close to release.
This commit is contained in:
Diego Borghetti 2007-07-16 21:22:48 +00:00
parent 61d7015ebe
commit a527ff7aac
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj vendored
View File

@ -346,6 +346,12 @@ ECHO Done
<Filter
Name="ConstraintSolver"
Filter="">
<File
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.cpp">
</File>
<File
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.h">
</File>
<File
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConstraintSolver.h">
</File>

1
extern/bullet2/src/SConscript vendored
View File

@ -29,6 +29,7 @@ bulletdyn_src = ["BulletDynamics/ConstraintSolver/btContactConstraint.cpp",
"BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp",
"BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp",
"BulletDynamics/ConstraintSolver/btTypedConstraint.cpp",
"BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp",
"BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp",
"BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp",
"BulletDynamics/Dynamics/btRigidBody.cpp",

8
source/blender/blenkernel/intern/anim.c
View File

@ -384,8 +384,12 @@ static void vertex_dupli__mapFunc(void *userData, int index, float *co, float *n
VECCOPY(obmat[3], vec);
if(vdd->par->transflag & OB_DUPLIROT) {
vec[0]= -no_f[0]; vec[1]= -no_f[1]; vec[2]= -no_f[2];
if(no_f) {
vec[0]= -no_f[0]; vec[1]= -no_f[1]; vec[2]= -no_f[2];
}
else if(no_s) {
vec[0]= -no_s[0]; vec[1]= -no_s[1]; vec[2]= -no_s[2];
}
q2= vectoquat(vec, vdd->ob->trackflag, vdd->ob->upflag);

4
source/blender/src/drawview.c
View File

@ -1017,11 +1017,13 @@ static void drawviewborder(void)
BIF_ThemeColor(TH_WIRE);
glRectf(x1, y1, x2, y2);
/* camera name */
/* camera name - draw in highlighted text colour */
if (ca && (ca->flag & CAM_SHOWNAME)) {
BIF_ThemeColor(TH_TEXT_HI);
glRasterPos2f(x1, y1-15);
BMF_DrawString(G.font, G.vd->camera->id.name+2);
BIF_ThemeColor(TH_WIRE);
}

12
source/blender/src/editobject.c
View File

@ -999,9 +999,15 @@ void clear_object(char mode)
if TESTBASELIB(base) {
ob= base->object;
if( (ob->flag & OB_POSEMODE) && ob==OBACT) {
clear_armature(ob, mode);
armature_clear= 1; /* silly system to prevent another dag update, so no action applied */
if ((ob->flag & OB_POSEMODE)) {
/* only clear pose transforms if:
* - with a mesh in weightpaint mode, it's related armature needs to be cleared
* - with clearing transform of object being edited at the time
*/
if ((G.f & G_WEIGHTPAINT) || ob==OBACT) {
clear_armature(ob, mode);
armature_clear= 1; /* silly system to prevent another dag update, so no action applied */
}
}
else if((G.f & G_WEIGHTPAINT)==0) {