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

[Diego Borghetti (Plumiferos)]

Revision: 11294
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11294
Author:   bdiego
Date:     2007-07-16 23:22:48 +0200 (Mon, 16 Jul 2007)

Log Message:
-----------
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.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11275
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11279
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11286
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11288
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11289
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11292

Modified Paths:
--------------
    branches/2-44-stable/blender/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
    branches/2-44-stable/blender/extern/bullet2/src/SConscript
    branches/2-44-stable/blender/source/blender/blenkernel/intern/anim.c
    branches/2-44-stable/blender/source/blender/src/drawview.c
    branches/2-44-stable/blender/source/blender/src/editobject.c

Modified: branches/2-44-stable/blender/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
===================================================================
--- branches/2-44-stable/blender/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2007-07-16 21:20:52 UTC (rev 11293)
+++ branches/2-44-stable/blender/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj	2007-07-16 21:22:48 UTC (rev 11294)
@@ -347,6 +347,12 @@
 					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>
 					<File

Modified: branches/2-44-stable/blender/extern/bullet2/src/SConscript
===================================================================
--- branches/2-44-stable/blender/extern/bullet2/src/SConscript	2007-07-16 21:20:52 UTC (rev 11293)
+++ branches/2-44-stable/blender/extern/bullet2/src/SConscript	2007-07-16 21:22:48 UTC (rev 11294)
@@ -29,6 +29,7 @@
                  "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",

Modified: branches/2-44-stable/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/2-44-stable/blender/source/blender/blenkernel/intern/anim.c	2007-07-16 21:20:52 UTC (rev 11293)
+++ branches/2-44-stable/blender/source/blender/blenkernel/intern/anim.c	2007-07-16 21:22:48 UTC (rev 11294)
@@ -384,9 +384,13 @@
 	VECCOPY(obmat[3], vec);
 	
 	if(vdd->par->transflag & OB_DUPLIROT) {
+		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];
+		}
 		
-		vec[0]= -no_f[0]; vec[1]= -no_f[1]; vec[2]= -no_f[2];
-		
 		q2= vectoquat(vec, vdd->ob->trackflag, vdd->ob->upflag);
 		
 		QuatToMat3(q2, mat);

Modified: branches/2-44-stable/blender/source/blender/src/drawview.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/drawview.c	2007-07-16 21:20:52 UTC (rev 11293)
+++ branches/2-44-stable/blender/source/blender/src/drawview.c	2007-07-16 21:22:48 UTC (rev 11294)
@@ -1017,11 +1017,13 @@
 	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);
 	}
 
 

Modified: branches/2-44-stable/blender/source/blender/src/editobject.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/editobject.c	2007-07-16 21:20:52 UTC (rev 11293)
+++ branches/2-44-stable/blender/source/blender/src/editobject.c	2007-07-16 21:22:48 UTC (rev 11294)
@@ -999,9 +999,15 @@
 		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) {