[Bf-blender-cvs] [73ad0df] master: Fix first part of T39956

[Antony Riakiotakis]

Commit: 73ad0dfbaeb34b8388e49243ceb539a097316843
Author: Antony Riakiotakis
Date:   Thu May 1 02:11:39 2014 +0300
https://developer.blender.org/rB73ad0dfbaeb34b8388e49243ceb539a097316843

Fix first part of T39956

show diffuse option not correctly calculated on opening a file.

Make sure we call pbvh_show_diffuse_color_set after building the pbvh so
vertex data are available to it.

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

M	source/blender/blenkernel/intern/cdderivedmesh.c

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

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index fae9c38..7379039 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -286,13 +286,13 @@ static PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
 		cddm->pbvh = BKE_pbvh_new();
 		cddm->pbvh_draw = can_pbvh_draw(ob, dm);
 
-		pbvh_show_diffuse_color_set(cddm->pbvh, ob->sculpt->show_diffuse_color);
-
 		BKE_mesh_tessface_ensure(me);
 		
 		BKE_pbvh_build_mesh(cddm->pbvh, me->mface, me->mvert,
 		                    me->totface, me->totvert, &me->vdata);
 
+		pbvh_show_diffuse_color_set(cddm->pbvh, ob->sculpt->show_diffuse_color);
+
 		deformed = ss->modifiers_active || me->key;
 
 		if (deformed && ob->derivedDeform) {