AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2025-01-04 22:20:14 +00:00
Code Issues Releases Wiki Activity

Fix for crash in new mesh/refiner code in OsdUtil. Need to

Browse Source 
set HBR_ADAPTIVE before including hbr code.  Also use an ifndef in
far/meshFactory.h so that code can be included where someone else has
already defined HBR_ADAPTIVE.
This commit is contained in:
Dirk Van Gelder 2013-11-01 22:17:11 -07:00
parent 83d9315e64
commit 0925fe5a4b
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opensubdiv/far/meshFactory.h
View File

@ -31,7 +31,9 @@
// adaptively, some tag data is added to HbrFace, HbrVertex and HbrHalfedge.
// While small, these tags incur some performance costs and are by default
// disabled.
#ifndef HBR_ADAPTIVE
#define HBR_ADAPTIVE
#endif
#include "../hbr/mesh.h"
#include "../hbr/bilinear.h"

5
opensubdiv/osdutil/mesh.cpp
View File

@ -25,6 +25,11 @@
#include "mesh.h"
#include <osd/vertex.h>
//XXX: required to set ADAPTIVE before hbr includes
#ifndef HBR_ADAPTIVE
#define HBR_ADAPTIVE
#endif
#include <hbr/catmark.h>
#include <sstream>

5
opensubdiv/osdutil/mesh.h
View File

@ -25,7 +25,12 @@
#ifndef PX_OSD_UTIL_MESH_H
#define PX_OSD_UTIL_MESH_H
//XXX: required to set ADAPTIVE before hbr includes
#ifndef HBR_ADAPTIVE
#define HBR_ADAPTIVE
#endif
#include <hbr/mesh.h>
#include <osd/vertex.h>
#include <string>