[Bf-blender-cvs] [206c42f] master: Fix compilation error with OpenSubdiv disabled

Sergey Sharybin noreply at git.blender.org
Wed Nov 4 18:31:27 CET 2015


Commit: 206c42f3ce294095be01caa0706581b51a17de18
Author: Sergey Sharybin
Date:   Wed Nov 4 22:31:06 2015 +0500
Branches: master
https://developer.blender.org/rB206c42f3ce294095be01caa0706581b51a17de18

Fix compilation error with OpenSubdiv disabled

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

M	source/blender/blenkernel/intern/CCGSubSurf_intern.h

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

diff --git a/source/blender/blenkernel/intern/CCGSubSurf_intern.h b/source/blender/blenkernel/intern/CCGSubSurf_intern.h
index e077102..7ec9f32 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_intern.h
+++ b/source/blender/blenkernel/intern/CCGSubSurf_intern.h
@@ -307,9 +307,11 @@ void ccgSubSurf__sync_opensubdiv(CCGSubSurf *ss);
  * main thread and schedule free for later free otherwise.
  */
 
+#ifdef WITH_OPENSUBDIV
 void ccgSubSurf__delete_osdGLMesh(struct OpenSubdiv_GLMesh *osd_mesh);
 void ccgSubSurf__delete_vertex_array(unsigned int vao);
 void ccgSubSurf__delete_pending(void);
+#endif
 
 /* * CCGSubSurf_opensubdiv_converter.c * */




More information about the Bf-blender-cvs mailing list