diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 15:47:23 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 15:47:23 +0400 |
commit | 9c58865d201372ddd615f1f9b36d37cbc6937b98 (patch) | |
tree | 3da4fe35629767650f03a46c9585e29de072cd33 /source | |
parent | b518197db7fd63f878c4360312c47f15b61f780a (diff) |
code cleanup: remove $Id's that crept back in, also osl style edits
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/compositor/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_decimate.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_boxmask.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_ellipsemask.c | 2 | ||||
-rw-r--r-- | source/blender/opencl/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonMain.cpp | 12 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonMain.h | 11 |
8 files changed, 10 insertions, 22 deletions
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 8b0e616515f..3c329b1dce4 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id: CMakeLists.txt 31746 2010-09-04 05:31:25Z joeedh $ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 9932ed17378..fcd710b9b13 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id: CMakeLists.txt 14444 2008-04-16 22:40:48Z hos $ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index cf409c27b2f..75bea939107 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -195,6 +195,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, TIMEIT_END(decim); #endif + CDDM_calc_normals(result); + return result; } diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.c b/source/blender/nodes/composite/nodes/node_composite_boxmask.c index 0f82fdb481a..d3c6b2ccef0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_boxmask.c +++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.c @@ -1,6 +1,4 @@ /* - * $Id: CMP_math.c 36271 2011-04-21 13:11:51Z campbellbarton $ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c index 5e7bd26d34a..761b0b13f11 100644 --- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c +++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c @@ -1,6 +1,4 @@ /* - * $Id: CMP_math.c 36271 2011-04-21 13:11:51Z campbellbarton $ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or diff --git a/source/blender/opencl/CMakeLists.txt b/source/blender/opencl/CMakeLists.txt index 20dcf33d363..b3c76db1bca 100644 --- a/source/blender/opencl/CMakeLists.txt +++ b/source/blender/opencl/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id: CMakeLists.txt 14444 2008-04-16 22:40:48Z hos $ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/source/gameengine/Ketsji/KX_PythonMain.cpp b/source/gameengine/Ketsji/KX_PythonMain.cpp index d926dff0bf5..740bb102fd9 100644 --- a/source/gameengine/Ketsji/KX_PythonMain.cpp +++ b/source/gameengine/Ketsji/KX_PythonMain.cpp @@ -1,6 +1,4 @@ -/* - * $Id: KX_PythonMain.cpp 37750 2011-06-27 09:27:56Z sjoerd $ - * +/* * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -17,15 +15,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. + * Contributor(s): Benoit Bolsee * * ***** END GPL LICENSE BLOCK ***** */ + /** \file gameengine/Ketsji/KX_PythonMain.cpp * \ingroup ketsji */ diff --git a/source/gameengine/Ketsji/KX_PythonMain.h b/source/gameengine/Ketsji/KX_PythonMain.h index 1460ea2ca96..e638fa9094e 100644 --- a/source/gameengine/Ketsji/KX_PythonMain.h +++ b/source/gameengine/Ketsji/KX_PythonMain.h @@ -1,6 +1,4 @@ -/* - * $Id: KX_PythonMain.h 37750 2011-06-27 09:27:56Z sjoerd $ - * +/* * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -31,11 +29,12 @@ * \ingroup ketsji */ -#ifndef __KX_PYTHON_MAIN -#define __KX_PYTHON_MAIN +#ifndef __KX_PYTHON_MAIN__ +#define __KX_PYTHON_MAIN__ #include "BKE_main.h" #include "DNA_scene_types.h" extern "C" char *KX_GetPythonMain(struct Scene* scene); extern "C" char *KX_GetPythonCode(struct Main *main, char *python_main); -#endif + +#endif /* __KX_PYTHON_MAIN__ */ |