[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53099] branches/soc-2008-mxcurioni/source /blender: Another big code clean-up patch by Bastien Montagne (GPL headers, indentation,
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Tue Dec 18 01:51:25 CET 2012
Revision: 53099
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53099
Author: kjym3
Date: 2012-12-18 00:51:25 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Another big code clean-up patch by Bastien Montagne (GPL headers, indentation,
spaces around operators, and so forth). Many thanks!
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/SConscript
branches/soc-2008-mxcurioni/source/blender/freestyle/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h
branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle_config.h
branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppCanvas.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppCanvas.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppConfig.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppConfig.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/Controller.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/Controller.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
Modified: branches/soc-2008-mxcurioni/source/blender/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/SConscript 2012-12-18 00:10:24 UTC (rev 53098)
+++ branches/soc-2008-mxcurioni/source/blender/SConscript 2012-12-18 00:51:25 UTC (rev 53099)
@@ -9,7 +9,7 @@
'blenloader/SConscript',
'gpu/SConscript',
'editors/SConscript',
- 'freestyle/SConscript',
+ 'freestyle/SConscript',
'imbuf/SConscript',
'makesdna/SConscript',
'render/SConscript',
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/CMakeLists.txt 2012-12-18 00:10:24 UTC (rev 53098)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/CMakeLists.txt 2012-12-18 00:51:25 UTC (rev 53099)
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2006, Blender Foundation
# All rights reserved.
@@ -27,8 +27,7 @@
set(INC
../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna
- ../python ../python/intern
- ../render/extern/include ../render/intern/include
+ ../python ../python/intern ../render/extern/include ../render/intern/include
../../../extern/glew/include ../../../intern/guardedalloc ../freestyle
)
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h 2012-12-18 00:10:24 UTC (rev 53098)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h 2012-12-18 00:51:25 UTC (rev 53099)
@@ -1,5 +1,4 @@
-/* FRS_freestyle.h
- *
+/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
@@ -26,59 +25,63 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#ifndef FRS_FREESTYLE_H
-#define FRS_FREESTYLE_H
+#ifndef __FRS_FREESTYLE_H__
+#define __FRS_FREESTYLE_H__
+/** \file blender/freestyle/FRS_freestyle.h
+ * \ingroup freestyle
+ */
+
#ifdef __cplusplus
extern "C" {
-#endif
-
- #include "DNA_listBase.h"
- #include "DNA_scene_types.h"
-
- #include "BKE_context.h"
- #include "BKE_object.h"
-
- struct Render;
-
- extern Scene *freestyle_scene;
- extern float freestyle_viewpoint[3];
- extern float freestyle_mv[4][4];
- extern float freestyle_proj[4][4];
- extern int freestyle_viewport[4];
+#endif
- // Rendering
- void FRS_initialize(void);
- void FRS_set_context(bContext* C);
- void FRS_read_file(bContext* C);
- int FRS_is_freestyle_enabled(struct SceneRenderLayer* srl);
- void FRS_init_stroke_rendering(struct Render* re);
- struct Render* FRS_do_stroke_rendering(struct Render* re, struct SceneRenderLayer* srl);
- void FRS_finish_stroke_rendering(struct Render* re);
- void FRS_composite_result(struct Render* re, struct SceneRenderLayer* srl, struct Render* freestyle_render);
- void FRS_exit(void);
-
- // Panel configuration
- void FRS_add_module(FreestyleConfig *config);
- void FRS_delete_module(FreestyleConfig *config, FreestyleModuleConfig *module_conf);
- void FRS_move_module_up(FreestyleConfig *config, FreestyleModuleConfig *module_conf);
- void FRS_move_module_down(FreestyleConfig *config, FreestyleModuleConfig *module_conf);
-
- FreestyleLineSet *FRS_add_lineset(FreestyleConfig *config);
- void FRS_copy_active_lineset(FreestyleConfig *config);
- void FRS_paste_active_lineset(FreestyleConfig *config);
- void FRS_delete_active_lineset(FreestyleConfig *config);
- void FRS_move_active_lineset_up(FreestyleConfig *config);
- void FRS_move_active_lineset_down(FreestyleConfig *config);
+#include "DNA_listBase.h"
+#include "DNA_scene_types.h"
- FreestyleLineSet *FRS_get_active_lineset(FreestyleConfig *config);
- short FRS_get_active_lineset_index(FreestyleConfig *config);
- void FRS_set_active_lineset_index(FreestyleConfig *config, short index);
+#include "BKE_context.h"
+#include "BKE_object.h"
- void FRS_unlink_target_object(FreestyleConfig *config, struct Object *ob);
+struct Render;
+extern Scene *freestyle_scene;
+extern float freestyle_viewpoint[3];
+extern float freestyle_mv[4][4];
+extern float freestyle_proj[4][4];
+extern int freestyle_viewport[4];
+
+/* Rendering */
+void FRS_initialize(void);
+void FRS_set_context(bContext* C);
+void FRS_read_file(bContext* C);
+int FRS_is_freestyle_enabled(struct SceneRenderLayer* srl);
+void FRS_init_stroke_rendering(struct Render* re);
+struct Render* FRS_do_stroke_rendering(struct Render* re, struct SceneRenderLayer* srl);
+void FRS_finish_stroke_rendering(struct Render* re);
+void FRS_composite_result(struct Render* re, struct SceneRenderLayer* srl, struct Render* freestyle_render);
+void FRS_exit(void);
+
+/* Panel configuration */
+void FRS_add_module(FreestyleConfig *config);
+void FRS_delete_module(FreestyleConfig *config, FreestyleModuleConfig *module_conf);
+void FRS_move_module_up(FreestyleConfig *config, FreestyleModuleConfig *module_conf);
+void FRS_move_module_down(FreestyleConfig *config, FreestyleModuleConfig *module_conf);
+
+FreestyleLineSet *FRS_add_lineset(FreestyleConfig *config);
+void FRS_copy_active_lineset(FreestyleConfig *config);
+void FRS_paste_active_lineset(FreestyleConfig *config);
+void FRS_delete_active_lineset(FreestyleConfig *config);
+void FRS_move_active_lineset_up(FreestyleConfig *config);
+void FRS_move_active_lineset_down(FreestyleConfig *config);
+
+FreestyleLineSet *FRS_get_active_lineset(FreestyleConfig *config);
+short FRS_get_active_lineset_index(FreestyleConfig *config);
+void FRS_set_active_lineset_index(FreestyleConfig *config, short index);
+
+void FRS_unlink_target_object(FreestyleConfig *config, struct Object *ob);
+
#ifdef __cplusplus
}
#endif
-#endif
+#endif // __FRS_FREESTYLE_H__
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle_config.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle_config.h 2012-12-18 00:10:24 UTC (rev 53098)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle_config.h 2012-12-18 00:51:25 UTC (rev 53099)
@@ -1,17 +1,48 @@
-#ifndef FRS_FREESTYLE_CONFIG_H
-#define FRS_FREESTYLE_CONFIG_H
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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) 2010 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef __FRS_FREESTYLE_CONFIG_H__
+#define __FRS_FREESTYLE_CONFIG_H__
+
+/** \file FRS_freestyle_config.h
+ * \ingroup freestyle
+ */
+
#ifdef __cplusplus
extern "C" {
-#endif
-
- #include "DNA_scene_types.h"
+#endif
- void FRS_add_freestyle_config( SceneRenderLayer* srl );
- void FRS_free_freestyle_config( SceneRenderLayer* srl );
+#include "DNA_scene_types.h"
+void FRS_add_freestyle_config(SceneRenderLayer* srl);
+void FRS_free_freestyle_config(SceneRenderLayer* srl);
+
#ifdef __cplusplus
}
#endif
-#endif
+#endif // __FRS_FREESTYLE_CONFIG_H__
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript 2012-12-18 00:10:24 UTC (rev 53098)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript 2012-12-18 00:51:25 UTC (rev 53099)
@@ -7,76 +7,69 @@
incs = ''
incs += '../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna'
-incs += ' ../python ../python/intern'
-incs += ' ../render/extern/include ../render/intern/include'
+incs += ' ../python ../python/intern ../render/extern/include ../render/intern/include'
incs += ' #/extern/glew/include #/intern/guardedalloc ../freestyle'
-incs += ' ' + env['BF_PYTHON_INC']
+incs += ' ' + env['BF_PYTHON_INC']
incs += ' ' + env['BF_PNG_INC']
-
if env['OURPLATFORM'] == 'linux2':
- cflags='-pthread'
- incs += ' ../../../extern/binreloc/include'
+ cflags='-pthread'
+ incs += ' ../../../extern/binreloc/include'
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
- incs += ' ' + env['BF_PTHREADS_INC']
+ incs += ' ' + env['BF_PTHREADS_INC']
########################################################
-# folders sources
+# folders sources
########################################################
-# system
+# system
prefix = 'intern/system'
system_sources = env.Glob(prefix + '/*.cpp')
-# image
+# image
prefix = 'intern/image'
image_sources = env.Glob(prefix + '/*.cpp')
-# geometry
+# geometry
prefix = 'intern/geometry'
geometry_sources = env.Glob(prefix + '/*.cpp')
-# scene_graph
+# scene_graph
prefix = 'intern/scene_graph'
scene_graph_sources = env.Glob(prefix + '/*.cpp')
-# winged_edge
+# winged_edge
prefix = 'intern/winged_edge'
winged_edge_sources = env.Glob(prefix + '/*.cpp')
-# view_map
+# view_map
prefix = 'intern/view_map'
view_map_sources = env.Glob(prefix + '/*.cpp')
-# stroke
+# stroke
prefix = 'intern/stroke'
stroke_sources = env.Glob(prefix + '/*.cpp')
-# application
+# application
prefix = 'intern/application'
application_sources = env.Glob(prefix + '/*.cpp')
-# blender_interface
+# blender_interface
prefix = 'intern/blender_interface'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list