[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18752] branches/bmesh/blender: merge with 2.5 at r18751
Joseph Eagar
joeedh at gmail.com
Fri Jan 30 16:48:39 CET 2009
Revision: 18752
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18752
Author: joeedh
Date: 2009-01-30 16:48:38 +0100 (Fri, 30 Jan 2009)
Log Message:
-----------
merge with 2.5 at r18751
Modified Paths:
--------------
branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj
branches/bmesh/blender/source/Makefile
branches/bmesh/blender/source/blender/CMakeLists.txt
branches/bmesh/blender/source/blender/Makefile
branches/bmesh/blender/source/blender/SConscript
branches/bmesh/blender/source/blender/blenkernel/BKE_action.h
branches/bmesh/blender/source/blender/blenkernel/BKE_fcurve.h
branches/bmesh/blender/source/blender/blenkernel/BKE_idprop.h
branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
branches/bmesh/blender/source/blender/blenkernel/BKE_sculpt.h
branches/bmesh/blender/source/blender/blenkernel/BKE_sequence.h
branches/bmesh/blender/source/blender/blenkernel/intern/action.c
branches/bmesh/blender/source/blender/blenkernel/intern/anim_sys.c
branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
branches/bmesh/blender/source/blender/blenkernel/intern/idprop.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/ipo.c
branches/bmesh/blender/source/blender/blenkernel/intern/key.c
branches/bmesh/blender/source/blender/blenkernel/intern/library.c
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequence.c
branches/bmesh/blender/source/blender/blenlib/intern/bpath.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/animation/anim_channels.c
branches/bmesh/blender/source/blender/editors/animation/anim_deps.c
branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
branches/bmesh/blender/source/blender/editors/animation/anim_ipo_utils.c
branches/bmesh/blender/source/blender/editors/animation/anim_markers.c
branches/bmesh/blender/source/blender/editors/animation/keyframes_edit.c
branches/bmesh/blender/source/blender/editors/animation/keyframes_general.c
branches/bmesh/blender/source/blender/editors/animation/keyframing.c
branches/bmesh/blender/source/blender/editors/curve/curve_ops.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/include/ED_anim_api.h
branches/bmesh/blender/source/blender/editors/include/ED_curve.h
branches/bmesh/blender/source/blender/editors/include/ED_keyframes_edit.h
branches/bmesh/blender/source/blender/editors/include/ED_object.h
branches/bmesh/blender/source/blender/editors/include/ED_util.h
branches/bmesh/blender/source/blender/editors/include/ED_uvedit.h
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/include/UI_text.h
branches/bmesh/blender/source/blender/editors/interface/Makefile
branches/bmesh/blender/source/blender/editors/interface/SConscript
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_intern.h
branches/bmesh/blender/source/blender/editors/interface/interface_panel.c
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/interface/text.c
branches/bmesh/blender/source/blender/editors/interface/view2d.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_add.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_mods.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/preview/previewrender.c
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/sculpt/sculpt.c
branches/bmesh/blender/source/blender/editors/space_action/action_edit.c
branches/bmesh/blender/source/blender/editors/space_action/action_header.c
branches/bmesh/blender/source/blender/editors/space_action/action_intern.h
branches/bmesh/blender/source/blender/editors/space_action/action_ops.c
branches/bmesh/blender/source/blender/editors/space_action/action_select.c
branches/bmesh/blender/source/blender/editors/space_action/space_action.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_header.c
branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
branches/bmesh/blender/source/blender/editors/space_file/file_header.c
branches/bmesh/blender/source/blender/editors/space_file/file_intern.h
branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
branches/bmesh/blender/source/blender/editors/space_file/space_file.c
branches/bmesh/blender/source/blender/editors/space_image/image_header.c
branches/bmesh/blender/source/blender/editors/space_image/image_intern.h
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
branches/bmesh/blender/source/blender/editors/space_info/info_header.c
branches/bmesh/blender/source/blender/editors/space_ipo/Makefile
branches/bmesh/blender/source/blender/editors/space_ipo/SConscript
branches/bmesh/blender/source/blender/editors/space_ipo/ipo_draw.c
branches/bmesh/blender/source/blender/editors/space_ipo/ipo_header.c
branches/bmesh/blender/source/blender/editors/space_ipo/ipo_intern.h
branches/bmesh/blender/source/blender/editors/space_ipo/space_ipo.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_header.c
branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_node/node_header.c
branches/bmesh/blender/source/blender/editors/space_node/node_intern.h
branches/bmesh/blender/source/blender/editors/space_node/node_ops.c
branches/bmesh/blender/source/blender/editors/space_node/node_select.c
branches/bmesh/blender/source/blender/editors/space_node/node_state.c
branches/bmesh/blender/source/blender/editors/space_node/space_node.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_header.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_intern.h
branches/bmesh/blender/source/blender/editors/space_script/script_header.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_add.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_header.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_ops.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_select.c
branches/bmesh/blender/source/blender/editors/space_sound/sound_header.c
branches/bmesh/blender/source/blender/editors/space_text/text_header.c
branches/bmesh/blender/source/blender/editors/space_time/time_header.c
branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform.h
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
branches/bmesh/blender/source/blender/editors/transform/transform_snap.c
branches/bmesh/blender/source/blender/editors/util/editmode_undo.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_intern.h
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/makesdna/DNA_action_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_anim_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_curve_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_view2d_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/bmesh/blender/source/blender/makesrna/intern/SConscript
branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_texture.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
branches/bmesh/blender/source/blender/python/intern/bpy_compat.h
branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator.h
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.h
branches/bmesh/blender/source/blender/python/intern/bpy_util.c
branches/bmesh/blender/source/blender/render/intern/source/occlusion.c
branches/bmesh/blender/source/blender/windowmanager/CMakeLists.txt
branches/bmesh/blender/source/blender/windowmanager/SConscript
branches/bmesh/blender/source/blender/windowmanager/WM_api.h
branches/bmesh/blender/source/blender/windowmanager/WM_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/Makefile
branches/bmesh/blender/source/blender/windowmanager/intern/wm.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_cursors.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_draw.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_jobs.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_keymap.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_window.c
branches/bmesh/blender/source/blender/windowmanager/wm_cursors.h
branches/bmesh/blender/source/creator/CMakeLists.txt
Added Paths:
-----------
branches/bmesh/blender/source/blender/blenfont/
branches/bmesh/blender/source/blender/blenfont/BLF_api.h
branches/bmesh/blender/source/blender/blenfont/CMakeLists.txt
branches/bmesh/blender/source/blender/blenfont/Makefile
branches/bmesh/blender/source/blender/blenfont/SConscript
branches/bmesh/blender/source/blender/blenfont/intern/
branches/bmesh/blender/source/blender/blenfont/intern/Makefile
branches/bmesh/blender/source/blender/blenfont/intern/blf_internal_types.h
branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
branches/bmesh/blender/source/blender/editors/include/ED_image.h
branches/bmesh/blender/source/blender/editors/include/ED_node.h
branches/bmesh/blender/source/blender/editors/space_ipo/ipo_edit.c
branches/bmesh/blender/source/blender/editors/space_ipo/ipo_ops.c
branches/bmesh/blender/source/blender/editors/space_ipo/ipo_select.c
Removed Paths:
-------------
branches/bmesh/blender/source/blender/blenfont/BLF_api.h
branches/bmesh/blender/source/blender/blenfont/CMakeLists.txt
branches/bmesh/blender/source/blender/blenfont/Makefile
branches/bmesh/blender/source/blender/blenfont/SConscript
branches/bmesh/blender/source/blender/blenfont/intern/
branches/bmesh/blender/source/blender/blenfont/intern/Makefile
branches/bmesh/blender/source/blender/blenfont/intern/blf_internal_types.h
branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
Modified: branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-01-30 15:01:14 UTC (rev 18751)
+++ branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-01-30 15:48:38 UTC (rev 18752)
@@ -206,10 +206,18 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\include\ED_editparticle.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\include\ED_fileselect.h"
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\include\ED_fluidsim.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\include\ED_gpencil.h"
>
</File>
@@ -238,6 +246,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\include\ED_node.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\include\ED_object.h"
>
</File>
@@ -559,6 +571,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\space_ipo\ipo_edit.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_ipo\ipo_header.c"
>
</File>
@@ -567,6 +583,14 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\space_ipo\ipo_ops.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\editors\space_ipo\ipo_select.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_ipo\space_ipo.c"
>
</File>
@@ -706,6 +730,10 @@
RelativePath="..\..\..\source\blender\editors\space_file\space_file.c"
>
</File>
+ <File
+ RelativePath="..\..\..\source\blender\editors\space_file\writeimage.c"
+ >
+ </File>
</Filter>
<Filter
Name="space_info"
@@ -1147,9 +1175,25 @@
Name="curve"
>
<File
+ RelativePath="..\..\..\source\blender\editors\curve\curve_intern.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\editors\curve\curve_ops.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\curve\editcurve.c"
>
</File>
+ <File
+ RelativePath="..\..\..\source\blender\editors\curve\editfont.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\editors\curve\lorem.c"
+ >
+ </File>
</Filter>
<Filter
Name="preview"
@@ -1163,6 +1207,22 @@
>
</File>
</Filter>
+ <Filter
+ Name="physics"
+ >
+ <File
+ RelativePath="..\..\..\source\blender\editors\physics\ed_fluidsim.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\editors\physics\editparticle.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\editors\physics\physics_intern.h"
+ >
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
Modified: branches/bmesh/blender/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj
===================================================================
--- branches/bmesh/blender/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj 2009-01-30 15:01:14 UTC (rev 18751)
+++ branches/bmesh/blender/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj 2009-01-30 15:48:38 UTC (rev 18752)
@@ -235,6 +235,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\windowmanager\wm_draw.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\windowmanager\wm_event_system.h"
>
</File>
Modified: branches/bmesh/blender/source/Makefile
===================================================================
--- branches/bmesh/blender/source/Makefile 2009-01-30 15:01:14 UTC (rev 18751)
+++ branches/bmesh/blender/source/Makefile 2009-01-30 15:48:38 UTC (rev 18752)
@@ -107,6 +107,7 @@
COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a
COMLIB += $(NAN_GLEW)/lib/libglew.a
COMLIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a
+COMLIB += $(OCGDIR)/blender/blenfont/$(DEBUG_DIR)libblenfont.a
ifneq ($(NAN_NO_KETSJI),true)
COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
Modified: branches/bmesh/blender/source/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/CMakeLists.txt 2009-01-30 15:01:14 UTC (rev 18751)
+++ branches/bmesh/blender/source/blender/CMakeLists.txt 2009-01-30 15:48:38 UTC (rev 18752)
@@ -24,7 +24,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna makesrna radiosity readblenfile render)
+SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna makesrna radiosity readblenfile render blenfont)
IF(WITH_INTERNATIONAL)
SUBDIRS(ftfont)
Modified: branches/bmesh/blender/source/blender/Makefile
===================================================================
--- branches/bmesh/blender/source/blender/Makefile 2009-01-30 15:01:14 UTC (rev 18751)
+++ branches/bmesh/blender/source/blender/Makefile 2009-01-30 15:48:38 UTC (rev 18752)
@@ -34,6 +34,7 @@
DIRS += avi imbuf render radiosity blenlib blenkernel blenpluginapi
DIRS += makesdna makesrna yafray
DIRS += python nodes gpu
+DIRS += blenfont
ifeq ($(WITH_FREETYPE2), true)
DIRS += ftfont
Modified: branches/bmesh/blender/source/blender/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/SConscript 2009-01-30 15:01:14 UTC (rev 18751)
+++ branches/bmesh/blender/source/blender/SConscript 2009-01-30 15:48:38 UTC (rev 18752)
@@ -18,7 +18,8 @@
'readblenfile/SConscript',
'render/SConscript',
'nodes/SConscript',
- 'windowmanager/SConscript'])
+ 'windowmanager/SConscript',
+ 'blenfont/SConscript'])
Copied: branches/bmesh/blender/source/blender/blenfont (from rev 18751, branches/blender2.5/blender/source/blender/blenfont)
Deleted: branches/bmesh/blender/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenfont/BLF_api.h 2009-01-30 15:01:14 UTC (rev 18751)
+++ branches/bmesh/blender/source/blender/blenfont/BLF_api.h 2009-01-30 15:48:38 UTC (rev 18752)
@@ -1,52 +0,0 @@
-/**
- * $Id:
- *
- * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2009 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef BLF_API_H
-#define BLF_API_H
-
-/* Read the .Blanguages file, return 1 on success or 0 if fails. */
-int BLF_lang_init(void);
-
-/* Free the memory allocate for the .Blanguages. */
-void BLF_lang_exit(void);
-
-/* Set the current Language. */
-void BLF_lang_set(int id);
-
-/* Return a string with all the Language available. */
-char *BLF_lang_pup(void);
-
-/* Return the number of invalid lines in the .Blanguages file,
- * zero means no error found.
- */
-int BLF_lang_error(void);
-
-/* Return the code string for the specified language code. */
-char *BLF_lang_find_code(short langid);
-
-#endif /* BLF_API_H */
Copied: branches/bmesh/blender/source/blender/blenfont/BLF_api.h (from rev 18751, branches/blender2.5/blender/source/blender/blenfont/BLF_api.h)
===================================================================
--- branches/bmesh/blender/source/blender/blenfont/BLF_api.h (rev 0)
+++ branches/bmesh/blender/source/blender/blenfont/BLF_api.h 2009-01-30 15:48:38 UTC (rev 18752)
@@ -0,0 +1,52 @@
+/**
+ * $Id:
+ *
+ * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2009 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef BLF_API_H
+#define BLF_API_H
+
+/* Read the .Blanguages file, return 1 on success or 0 if fails. */
+int BLF_lang_init(void);
+
+/* Free the memory allocate for the .Blanguages. */
+void BLF_lang_exit(void);
+
+/* Set the current Language. */
+void BLF_lang_set(int id);
+
+/* Return a string with all the Language available. */
+char *BLF_lang_pup(void);
+
+/* Return the number of invalid lines in the .Blanguages file,
+ * zero means no error found.
+ */
+int BLF_lang_error(void);
+
+/* Return the code string for the specified language code. */
+char *BLF_lang_find_code(short langid);
+
+#endif /* BLF_API_H */
Deleted: branches/bmesh/blender/source/blender/blenfont/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt 2009-01-30 15:01:14 UTC (rev 18751)
+++ branches/bmesh/blender/source/blender/blenfont/CMakeLists.txt 2009-01-30 15:48:38 UTC (rev 18752)
@@ -1,38 +0,0 @@
-# $Id $
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list