[Bf-blender-cvs] [6f7eb62] master: Avoid include header from previous commit when building without OpenSubdiv

Sergey Sharybin noreply at git.blender.org
Tue Aug 25 13:26:48 CEST 2015


Commit: 6f7eb623d3beaf7e49b5bb0d7686c2b2c714d867
Author: Sergey Sharybin
Date:   Tue Aug 25 13:24:02 2015 +0200
Branches: master
https://developer.blender.org/rB6f7eb623d3beaf7e49b5bb0d7686c2b2c714d867

Avoid include header from previous commit when building without OpenSubdiv

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

M	source/blender/modifiers/intern/MOD_subsurf.c

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

diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c
index 88d461b..ab52d79 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -37,7 +37,10 @@
 
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
-#include "DNA_userdef_types.h"
+
+#ifdef WITH_OPENSUBDIV
+#  include "DNA_userdef_types.h"
+#endif
 
 #include "BLI_utildefines.h"




More information about the Bf-blender-cvs mailing list