diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-09-30 18:57:02 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-09-30 19:05:06 +0300 |
| commit | 035d27dca69d9e0d3e7b1e035bdc1362c3e33a97 (patch) | |
| tree | 7ae6cc54ef85c795dc838120c98be60d5550cf09 | |
| parent | e1c77fb98dc19fae5f8f0661cf2ed4f1e89df036 (diff) | |
Revert "Fix T46247: Side-reported, bbox for zero-verts object with OSD subsurf and GPU compute would be -INF."
This reverts commit b278e8742be436f7d0272033bc93def1d47f1752.
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 05f658e0b2b..509ca9cdd19 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); |