Commit: b2ecbaf2c6e7ea5c98346ca5ce7a42e29f22f865
Author: Sergey Sharybin
Date: Fri May 2 04:47:55 2014 +0600
https://developer.blender.org/rBb2ecbaf2c6e7ea5c98346ca5ce7a42e29f22f865
Code cleanup: make branch closer to master
There were some experiment changes which weren't fully removed.
===================================================================
M source/blender/blenkernel/SConscript
M source/blender/modifiers/intern/MOD_subsurf.c
===================================================================
diff --git a/source/blender/blenkernel/SConscript
b/source/blender/blenkernel/SConscript
index bb3534b..0b20a07 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -169,7 +169,7 @@ if env['WITH_BF_FREESTYLE']:
if env['WITH_BF_OPENSUBDIV']:
defs.append('WITH_OPENSUBDIV')
- incs += ' ' + env['BF_OPENSUBDIV_INC']
+ incs += ' ' + env['BF_OPENSUBDIV_INC']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc',
'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']
diff --git a/source/blender/modifiers/intern/MOD_subsurf.c
b/source/blender/modifiers/intern/MOD_subsurf.c
index 9e1c896..3de8504 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -35,13 +35,11 @@
#include <stddef.h>
-#include "MEM_guardedalloc.h"
-
#include "DNA_scene_types.h"
#include "DNA_object_types.h"
#include "BLI_utildefines.h"
-#include "BLI_math.h"
+
#include "BKE_cdderivedmesh.h"
#include "BKE_scene.h"
@@ -137,6 +135,7 @@ static DerivedMesh *applyModifierEM(ModifierData *md,
Object *UNUSED(ob),
return result;
}
+
ModifierTypeInfo modifierType_Subsurf = {
/* name */ "Subsurf",
/* structName */ "SubsurfModifierData",
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
