add in asserts when rv3d->viewmatob, rv3d->persmatob are not initialized.

This is often hard to spot since in many cases it works correctly even
when not initialized but may still fail in other situations.

5 files changed, 42 insertions, 3 deletions

diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index 2ff52b51069..5af2296e60a 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -2097,7 +2097,9 @@ static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, const short dt)
 	
 	/* being set in code below */
 	arm->layer_used = 0;
-	
+
+	ED_view3d_check_mats_rv3d(rv3d);
+
 	/* envelope (deform distance) */
 	if (arm->drawtype == ARM_ENVELOPE) {
 		/* precalc inverse matrix for drawing screen aligned */
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index d1cae903bec..09a2384e868 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7001,6 +7001,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 	if ((base->flag & OB_FROMDUPLI) ||
 	    (v3d->flag2 & V3D_RENDER_OVERRIDE))
 	{
+		ED_view3d_clear_mats_rv3d(rv3d);
 		return;
 	}
 
@@ -7144,6 +7145,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 	}
 
 	free_old_images();
+
+	ED_view3d_clear_mats_rv3d(rv3d);
 }
 
 /* ***************** BACKBUF SEL (BBS) ********* */
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 45274cbd619..363eea480b9 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -243,6 +243,21 @@ void ED_view3d_init_mats_rv3d_gl(struct Object *ob, struct RegionView3D *rv3d)
 	glMultMatrixf(ob->obmat);
 }
 
+#ifdef DEBUG
+/* ensure we correctly initialize */
+void ED_view3d_clear_mats_rv3d(struct RegionView3D *rv3d)
+{
+	zero_m4(rv3d->viewmatob);
+	zero_m4(rv3d->persmatob);
+}
+
+void ED_view3d_check_mats_rv3d(struct RegionView3D *rv3d)
+{
+	BLI_ASSERT_ZERO_M4(rv3d->viewmatob);
+	BLI_ASSERT_ZERO_M4(rv3d->persmatob);
+}
+#endif
+
 /* ******************** default callbacks for view3d space ***************** */
 
 static SpaceLink *view3d_new(const bContext *C)
diff --git a/source/blender/editors/space_view3d/view3d_iterators.c b/source/blender/editors/space_view3d/view3d_iterators.c
index 81e890c37ee..9e310c84bd0 100644
--- a/source/blender/editors/space_view3d/view3d_iterators.c
+++ b/source/blender/editors/space_view3d/view3d_iterators.c
@@ -112,6 +112,8 @@ void meshobject_foreachScreenVert(
 	foreachScreenObjectVert_userData data;
 	DerivedMesh *dm = mesh_get_derived_deform(vc->scene, vc->obact, CD_MASK_BAREMESH);
 
+	ED_view3d_check_mats_rv3d(vc->rv3d);
+
 	data.vc = *vc;
 	data.func = func;
 	data.userData = userData;
@@ -151,6 +153,8 @@ void mesh_foreachScreenVert(
 	foreachScreenVert_userData data;
 	DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
 
+	ED_view3d_check_mats_rv3d(vc->rv3d);
+
 	data.vc = *vc;
 	data.func = func;
 	data.userData = userData;
@@ -203,6 +207,8 @@ void mesh_foreachScreenEdge(
 	foreachScreenEdge_userData data;
 	DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
 
+	ED_view3d_check_mats_rv3d(vc->rv3d);
+
 	data.vc = *vc;
 
 	data.win_rect.xmin = 0;
@@ -247,13 +253,13 @@ void mesh_foreachScreenFace(
 	foreachScreenFace_userData data;
 	DerivedMesh *dm = editbmesh_get_derived_cage(vc->scene, vc->obedit, vc->em, CD_MASK_BAREMESH);
 
+	ED_view3d_check_mats_rv3d(vc->rv3d);
+
 	data.vc = *vc;
 	data.func = func;
 	data.userData = userData;
 	data.clip_flag = clip_flag;
 
-	ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d);
-
 	EDBM_index_arrays_ensure(vc->em, BM_FACE);
 	dm->foreachMappedFaceCenter(dm, mesh_foreachScreenFace__mapFunc, &data);
 
@@ -272,6 +278,8 @@ void nurbs_foreachScreenVert(
 	int i;
 	ListBase *nurbs = BKE_curve_editNurbs_get(cu);
 
+	ED_view3d_check_mats_rv3d(vc->rv3d);
+
 	if (clip_flag & V3D_PROJ_TEST_CLIP_BB) {
 		ED_view3d_clipping_local(vc->rv3d, vc->obedit->obmat); /* for local clipping lookups */
 	}
@@ -339,6 +347,8 @@ void mball_foreachScreenElem(
 	MetaBall *mb = (MetaBall *)vc->obedit->data;
 	MetaElem *ml;
 
+	ED_view3d_check_mats_rv3d(vc->rv3d);
+
 	for (ml = mb->editelems->first; ml; ml = ml->next) {
 		float screen_co[2];
 		if (ED_view3d_project_float_object(vc->ar, &ml->x, screen_co, clip_flag) == V3D_PROJ_RET_OK) {
@@ -361,6 +371,8 @@ void lattice_foreachScreenVert(
 	float *co = dl ? dl->verts : NULL;
 	int i, N = lt->editlatt->latt->pntsu * lt->editlatt->latt->pntsv * lt->editlatt->latt->pntsw;
 
+	ED_view3d_check_mats_rv3d(vc->rv3d);
+
 	if (clip_flag & V3D_PROJ_TEST_CLIP_BB) {
 		ED_view3d_clipping_local(vc->rv3d, obedit->obmat); /* for local clipping lookups */
 	}
@@ -386,6 +398,8 @@ void armature_foreachScreenBone(
 	bArmature *arm = vc->obedit->data;
 	EditBone *ebone;
 
+	ED_view3d_check_mats_rv3d(vc->rv3d);
+
 	for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {
 		if (EBONE_VISIBLE(arm, ebone)) {
 			float screen_co_a[2], screen_co_b[2];
@@ -429,6 +443,8 @@ void pose_foreachScreenBone(
 	bPose *pose = vc->obact->pose;
 	bPoseChannel *pchan;
 
+	ED_view3d_check_mats_rv3d(vc->rv3d);
+
 	for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
 		if (PBONE_VISIBLE(arm, pchan->bone)) {
 			float screen_co_a[2], screen_co_b[2];
diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c
index 4be4328d6c3..b9d24b248da 100644
--- a/source/blender/editors/space_view3d/view3d_project.c
+++ b/source/blender/editors/space_view3d/view3d_project.c
@@ -237,6 +237,7 @@ eV3DProjStatus ED_view3d_project_short_global(const ARegion *ar, const float co[
 eV3DProjStatus ED_view3d_project_short_object(const ARegion *ar, const float co[3], short r_co[2], const eV3DProjTest flag)
 {
 	RegionView3D *rv3d = ar->regiondata;
+	ED_view3d_check_mats_rv3d(rv3d);
 	return ED_view3d_project_short_ex(ar, rv3d->persmatob, true, co, r_co, flag);
 }
 
@@ -250,6 +251,7 @@ eV3DProjStatus ED_view3d_project_int_global(const ARegion *ar, const float co[3]
 eV3DProjStatus ED_view3d_project_int_object(const ARegion *ar, const float co[3], int r_co[2], const eV3DProjTest flag)
 {
 	RegionView3D *rv3d = ar->regiondata;
+	ED_view3d_check_mats_rv3d(rv3d);
 	return ED_view3d_project_int_ex(ar, rv3d->persmatob, true, co, r_co, flag);
 }
 
@@ -263,6 +265,7 @@ eV3DProjStatus ED_view3d_project_float_global(const ARegion *ar, const float co[
 eV3DProjStatus ED_view3d_project_float_object(const ARegion *ar, const float co[3], float r_co[2], const eV3DProjTest flag)
 {
 	RegionView3D *rv3d = ar->regiondata;
+	ED_view3d_check_mats_rv3d(rv3d);
 	return ED_view3d_project_float_ex(ar, rv3d->persmatob, true, co, r_co, flag);
 }