[Bf-blender-cvs] [95763b8] master: Revert "Fix T46247: Side-reported, bbox for zero-verts object with OSD subsurf and GPU compute would be -INF."

Sergey Sharybin noreply at git.blender.org
Wed Sep 30 18:01:06 CEST 2015


Commit: 95763b8c8a7fe22d40d218a98ef72e1e05d438f6
Author: Sergey Sharybin
Date:   Wed Sep 30 20:57:02 2015 +0500
Branches: master
https://developer.blender.org/rB95763b8c8a7fe22d40d218a98ef72e1e05d438f6

Revert "Fix T46247: Side-reported, bbox for zero-verts object with OSD subsurf and GPU compute would be -INF."

This reverts commit b278e8742be436f7d0272033bc93def1d47f1752.

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

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 05f658e..509ca9c 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -848,11 +848,6 @@ static void ccgDM_getMinMax(DerivedMesh *dm, float r_min[3], float r_max[3])
 	int i, edgeSize = ccgSubSurf_getEdgeSize(ss);
 	int gridSize = ccgSubSurf_getGridSize(ss);
 
-	if (!ccgSubSurf_getNumVerts(ss)) {
-		r_min[0] = r_min[1] = r_min[2] = r_max[0] = r_max[1] = r_max[2] = 0.0f;
-		return;
-	}
-
 #ifdef WITH_OPENSUBDIV
 	if (ccgdm->useGpuBackend) {
 		ccgSubSurf_getMinMax(ccgdm->ss, r_min, r_max);
@@ -862,6 +857,9 @@ static void ccgDM_getMinMax(DerivedMesh *dm, float r_min[3], float r_max[3])
 
 	CCG_key_top_level(&key, ss);
 
+	if (!ccgSubSurf_getNumVerts(ss))
+		r_min[0] = r_min[1] = r_min[2] = r_max[0] = r_max[1] = r_max[2] = 0.0;
+
 	for (ccgSubSurf_initVertIterator(ss, &vi); !ccgVertIterator_isStopped(&vi); ccgVertIterator_next(&vi)) {
 		CCGVert *v = ccgVertIterator_getCurrent(&vi);
 		float *co = ccgSubSurf_getVertData(ss, v);




More information about the Bf-blender-cvs mailing list