[Bf-blender-cvs] [f4b6557] master: Fix T45776: Rotate around selected fails in texture-paint mode w/ armature

[Campbell Barton]

Commit: f4b65577ffe96713e1c4893113e6aa03632778e3
Author: Campbell Barton
Date:   Tue Aug 25 23:25:05 2015 +1000
Branches: master
https://developer.blender.org/rBf4b65577ffe96713e1c4893113e6aa03632778e3

Fix T45776: Rotate around selected fails in texture-paint mode w/ armature

Only rotate around the active pose bone when in weight-paint mode too.

===================================================================

M	source/blender/editors/space_view3d/view3d_edit.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index e5b39f1..dd82e66 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -631,7 +631,10 @@ static bool view3d_orbit_calc_center(bContext *C, float r_dyn_ofs[3])
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = OBACT;
 
-	if (ob && (ob->mode & OB_MODE_ALL_PAINT) && (BKE_object_pose_armature_get(ob) == NULL)) {
+	if (ob && (ob->mode & OB_MODE_ALL_PAINT) &&
+	    /* with weight-paint + pose-mode, fall through to using calculateTransformCenter */
+	    ((ob->mode & OB_MODE_WEIGHT_PAINT) && BKE_object_pose_armature_get(ob)) == 0)
+	{
 		/* in case of sculpting use last average stroke position as a rotation
 		 * center, in other cases it's not clear what rotation center shall be
 		 * so just rotate around object origin