[Bf-blender-cvs] [b5287b1] master: Avoid reupdating pbvh data in upload functions, these should have been taken care of in draw functions.

Antony Riakiotakis noreply at git.blender.org
Tue Sep 1 18:56:41 CEST 2015


Commit: b5287b1b81bf7793753f27030f040c3036730cf2
Author: Antony Riakiotakis
Date:   Tue Sep 1 19:56:23 2015 +0300
Branches: master
https://developer.blender.org/rBb5287b1b81bf7793753f27030f040c3036730cf2

Avoid reupdating pbvh data in upload functions, these should have been
taken care of in draw functions.

Those iterate the whole PBVH tree so better avoid doing them, twice or
thrice.

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

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

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

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 998bb98..9f83318 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -1912,9 +1912,6 @@ static void ccgDM_buffer_copy_normal(
 	int shademodel;
 	int start = 0;
 
-	CCG_key_top_level(&key, ss);
-	ccgdm_pbvh_update(ccgdm);
-
 	for (i = 0; i < totface; i++) {
 		CCGFace *f = ccgdm->faceMap[i].face;
 		int S, x, y, numVerts = ccgSubSurf_getFaceNumVerts(f);
@@ -2116,10 +2113,7 @@ static void ccgDM_buffer_copy_vertex(
 	int totedge = ccgSubSurf_getNumEdges(ss);
 	int start = 0;
 	int edgeSize = ccgSubSurf_getEdgeSize(ss);
-	
-	CCG_key_top_level(&key, ss);
-	ccgdm_pbvh_update(ccgdm);
-	
+
 	for (i = 0; i < totface; i++) {
 		CCGFace *f = ccgdm->faceMap[i].face;
 		int S, x, y, numVerts = ccgSubSurf_getFaceNumVerts(f);




More information about the Bf-blender-cvs mailing list