fix for weight paint mode drawing selected verts even when it wasnt the active object.

2 files changed, 17 insertions, 2 deletions

diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 56ce853bfb9..fe848f3d76c 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -90,15 +90,28 @@ void paint_brush_set(Paint *p, Brush *br)
 	}
 }
 
+/* are we in vertex paint or weight pain face select mode? */
 int paint_facesel_test(Object *ob)
 {
-	return (ob && ob->type==OB_MESH && ob->data && (((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_MASK) && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)));
+	return ( (ob != NULL) &&
+	         (ob->type == OB_MESH) &&
+	         (ob->data != NULL) &&
+	         (((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_MASK) &&
+	         (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))
+	         );
 }
 
+/* are we in weight paint vertex select mode? */
 int paint_vertsel_test(Object *ob)
 {
-	return (ob && ob->type==OB_MESH && ob->data && (((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) && (ob->mode & OB_MODE_WEIGHT_PAINT));
+	return ( (ob != NULL) &&
+	         (ob->type == OB_MESH) &&
+	         (ob->data != NULL) &&
+	         (((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) &&
+	         (ob->mode & OB_MODE_WEIGHT_PAINT)
+	         );
 }
+
 void paint_init(Paint *p, const char col[3])
 {
 	Brush *brush;
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index 2d906a9199b..20871dc5b52 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -1650,6 +1650,7 @@ void BKE_tracking_reconstruction_context_free(MovieReconstructContext *context)
 	MEM_freeN(context);
 }
 
+#ifdef WITH_LIBMV
 static void solve_reconstruction_update_cb(void *customdata, double progress, const char *message)
 {
 	ReconstructProgressData *progressdata= customdata;
@@ -1662,6 +1663,7 @@ static void solve_reconstruction_update_cb(void *customdata, double progress, co
 	BLI_snprintf(progressdata->stats_message, progressdata->message_size,
 			"Solving camera | %s", message);
 }
+#endif
 
 #if 0
 static int solve_reconstruction_testbreak_cb(void *customdata)