[Bf-blender-cvs] [2e2dc9b] master: Refactor translation code out of blenfont

Campbell Barton noreply at git.blender.org
Mon Aug 17 23:06:35 CEST 2015


Commit: 2e2dc9b9e32d104a0f7c3241ea0c11b57a37fd5b
Author: Campbell Barton
Date:   Sun Aug 16 17:32:01 2015 +1000
Branches: master
https://developer.blender.org/rB2e2dc9b9e32d104a0f7c3241ea0c11b57a37fd5b

Refactor translation code out of blenfont

- Add blentranslation `BLT_*` module.
- moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`).
- moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.

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

M	build_files/cmake/macros.cmake
M	source/blender/CMakeLists.txt
M	source/blender/SConscript
M	source/blender/blenfont/BLF_api.h
D	source/blender/blenfont/BLF_translation.h
M	source/blender/blenfont/CMakeLists.txt
M	source/blender/blenfont/SConscript
A	source/blender/blenfont/intern/blf_font_i18n.c
D	source/blender/blenfont/intern/blf_lang.c
M	source/blender/blenfont/intern/blf_thumbs.c
D	source/blender/blenfont/intern/blf_translation.c
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/SConscript
M	source/blender/blenkernel/intern/action.c
M	source/blender/blenkernel/intern/anim.c
M	source/blender/blenkernel/intern/anim_sys.c
M	source/blender/blenkernel/intern/constraint.c
M	source/blender/blenkernel/intern/context.c
M	source/blender/blenkernel/intern/customdata.c
M	source/blender/blenkernel/intern/deform.c
M	source/blender/blenkernel/intern/dynamicpaint.c
M	source/blender/blenkernel/intern/fcurve.c
M	source/blender/blenkernel/intern/fmodifier.c
M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/blenkernel/intern/idcode.c
M	source/blender/blenkernel/intern/ipo.c
M	source/blender/blenkernel/intern/key.c
M	source/blender/blenkernel/intern/library.c
M	source/blender/blenkernel/intern/mask.c
M	source/blender/blenkernel/intern/modifier.c
M	source/blender/blenkernel/intern/nla.c
M	source/blender/blenkernel/intern/node.c
M	source/blender/blenkernel/intern/object.c
M	source/blender/blenkernel/intern/object_deform.c
M	source/blender/blenkernel/intern/particle.c
M	source/blender/blenkernel/intern/pointcache.c
M	source/blender/blenkernel/intern/report.c
M	source/blender/blenkernel/intern/scene.c
M	source/blender/blenkernel/intern/seqmodifier.c
M	source/blender/blenkernel/intern/sequencer.c
M	source/blender/blenkernel/intern/tracking.c
M	source/blender/blenkernel/intern/tracking_solver.c
M	source/blender/blenkernel/intern/tracking_util.c
M	source/blender/blenloader/CMakeLists.txt
M	source/blender/blenloader/SConscript
M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/versioning_260.c
A	source/blender/blentranslation/BLT_lang.h
A	source/blender/blentranslation/BLT_translation.h
A	source/blender/blentranslation/CMakeLists.txt
A	source/blender/blentranslation/SConscript
A	source/blender/blentranslation/intern/blt_lang.c
A	source/blender/blentranslation/intern/blt_translation.c
M	source/blender/bmesh/CMakeLists.txt
M	source/blender/bmesh/SConscript
M	source/blender/bmesh/intern/bmesh_core.c
M	source/blender/bmesh/intern/bmesh_operators.c
M	source/blender/collada/AnimationImporter.cpp
M	source/blender/collada/CMakeLists.txt
M	source/blender/collada/SConscript
M	source/blender/editors/animation/CMakeLists.txt
M	source/blender/editors/animation/SConscript
M	source/blender/editors/animation/anim_channels_defines.c
M	source/blender/editors/animation/anim_ipo_utils.c
M	source/blender/editors/animation/fmodifier_ui.c
M	source/blender/editors/animation/keyframing.c
M	source/blender/editors/armature/CMakeLists.txt
M	source/blender/editors/armature/SConscript
M	source/blender/editors/armature/armature_edit.c
M	source/blender/editors/armature/armature_naming.c
M	source/blender/editors/armature/armature_relations.c
M	source/blender/editors/armature/meshlaplacian.c
M	source/blender/editors/armature/pose_lib.c
M	source/blender/editors/curve/CMakeLists.txt
M	source/blender/editors/curve/SConscript
M	source/blender/editors/curve/editcurve.c
M	source/blender/editors/curve/editcurve_add.c
M	source/blender/editors/gpencil/CMakeLists.txt
M	source/blender/editors/gpencil/SConscript
M	source/blender/editors/gpencil/drawgpencil.c
M	source/blender/editors/gpencil/gpencil_convert.c
M	source/blender/editors/gpencil/gpencil_data.c
M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/editors/interface/CMakeLists.txt
M	source/blender/editors/interface/SConscript
M	source/blender/editors/interface/interface.c
M	source/blender/editors/interface/interface_eyedropper.c
M	source/blender/editors/interface/interface_handlers.c
M	source/blender/editors/interface/interface_layout.c
M	source/blender/editors/interface/interface_ops.c
M	source/blender/editors/interface/interface_panel.c
M	source/blender/editors/interface/interface_regions.c
M	source/blender/editors/interface/interface_style.c
M	source/blender/editors/interface/interface_templates.c
M	source/blender/editors/interface/interface_utils.c
M	source/blender/editors/io/CMakeLists.txt
M	source/blender/editors/io/SConscript
M	source/blender/editors/io/io_collada.c
M	source/blender/editors/mesh/CMakeLists.txt
M	source/blender/editors/mesh/SConscript
M	source/blender/editors/mesh/editmesh_add.c
M	source/blender/editors/mesh/editmesh_bevel.c
M	source/blender/editors/mesh/editmesh_bisect.c
M	source/blender/editors/mesh/editmesh_inset.c
M	source/blender/editors/mesh/editmesh_knife.c
M	source/blender/editors/mesh/editmesh_loopcut.c
M	source/blender/editors/mesh/editmesh_tools.c
M	source/blender/editors/object/CMakeLists.txt
M	source/blender/editors/object/SConscript
M	source/blender/editors/object/object_add.c
M	source/blender/editors/object/object_constraint.c
M	source/blender/editors/object/object_edit.c
M	source/blender/editors/object/object_relations.c
M	source/blender/editors/object/object_select.c
M	source/blender/editors/physics/CMakeLists.txt
M	source/blender/editors/physics/SConscript
M	source/blender/editors/physics/dynamicpaint_ops.c
M	source/blender/editors/physics/rigidbody_object.c
M	source/blender/editors/render/CMakeLists.txt
M	source/blender/editors/render/SConscript
M	source/blender/editors/render/render_internal.c
M	source/blender/editors/render/render_shading.c
M	source/blender/editors/screen/CMakeLists.txt
M	source/blender/editors/screen/SConscript
M	source/blender/editors/screen/screen_ops.c
M	source/blender/editors/sculpt_paint/CMakeLists.txt
M	source/blender/editors/sculpt_paint/SConscript
M	source/blender/editors/sculpt_paint/paint_image_proj.c
M	source/blender/editors/sculpt_paint/paint_utils.c
M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/editors/space_action/CMakeLists.txt
M	source/blender/editors/space_action/SConscript
M	source/blender/editors/space_action/action_data.c
M	source/blender/editors/space_action/action_edit.c
M	source/blender/editors/space_buttons/CMakeLists.txt
M	source/blender/editors/space_buttons/SConscript
M	source/blender/editors/space_buttons/buttons_context.c
M	source/blender/editors/space_buttons/buttons_ops.c
M	source/blender/editors/space_buttons/buttons_texture.c
M	source/blender/editors/space_clip/CMakeLists.txt
M	source/blender/editors/space_clip/SConscript
M	source/blender/editors/space_clip/clip_buttons.c
M	source/blender/editors/space_clip/clip_ops.c
M	source/blender/editors/space_clip/clip_toolbar.c
M	source/blender/editors/space_clip/tracking_ops.c
M	source/blender/editors/space_file/CMakeLists.txt
M	source/blender/editors/space_file/SConscript
M	source/blender/editors/space_file/file_draw.c
M	source/blender/editors/space_file/file_panels.c
M	source/blender/editors/space_graph/CMakeLists.txt
M	source/blender/editors/space_graph/SConscript
M	source/blender/editors/space_graph/graph_buttons.c
M	source/blender/editors/space_graph/graph_edit.c
M	source/blender/editors/space_image/CMakeLists.txt
M	source/blender/editors/space_image/SConscript
M	source/blender/editors/space_image/image_buttons.c
M	source/blender/editors/space_image/image_ops.c
M	source/blender/editors/space_info/CMakeLists.txt
M	source/blender/editors/space_info/SConscript
M	source/blender/editors/space_info/info_ops.c
M	source/blender/editors/space_info/info_stats.c
M	source/blender/editors/space_info/space_info.c
M	source/blender/editors/space_logic/CMakeLists.txt
M	source/blender/editors/space_logic/SConscript
M	source/blender/editors/space_logic/logic_ops.c
M	source/blender/editors/space_logic/logic_window.c
M	source/blender/editors/space_nla/CMakeLists.txt
M	source/blender/editors/space_nla/SConscript
M	source/blender/editors/space_nla/nla_buttons.c
M	source/blender/editors/space_nla/nla_edit.c
M	source/blender/editors/space_node/CMakeLists.txt
M	source/blender/editors/space_node/SConscript
M	source/blender/editors/space_node/drawnode.c
M	source/blender/editors/space_node/node_add.c
M	source/blender/editors/space_node/node_buttons.c
M	source/blender/editors/space_node/node_draw.c
M	source/blender/editors/space_node/node_group.c
M	source/blender/editors/space_node/node_relationships.c
M	source/blender/editors/space_node/node_templates.c
M	source/blender/editors/space_outliner/CMakeLists.txt
M	source/blender/editors/space_outliner/SConscript
M	source/blender/editors/space_outliner/outliner_draw.c
M	source/blender/editors/space_outliner/outliner_edit.c
M	source/blender/editors/space_outliner/outliner_tree.c
M	source/blender/editors/space_sequencer/CMakeLists.txt
M	source/blender/editors/space_sequencer/SConscript
M	source/blender/editors/space_sequencer/sequencer_buttons.c
M	source/blender/editors/space_sequencer/sequencer_edit.c
M	source/blender/editors/space_text/CMakeLists.txt
M	source/blender/editors/space_text/SConscript
M	source/blender/editors/space_text/text_header.c
M	source/blender/editors/space_text/text_ops.c
M	source/blender/editors/space_view3d/CMakeLists.txt
M	source/blender/editors/space_view3d/SConscript
M	source/blender/editors/space_view3d/view3d_buttons.c
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/editors/space_view3d/view3d_fly.c
M	source/blender/editors/space_view3d/view3d_header.c
M	source/blender/editors/space_view3d/view3d_toolbar.c
M	source/blender/editors/space_view3d/view3d_walk.c
M	source/blender/editors/transform/CMakeLists.txt
M	source/blender/editors/transform/SConscript
M	source/blender/editors/transform/transform.c
M	source/blender/editors/transform/transform_constraints.c
M	source/blender/editors/transform/transform_generics.c
M	source/blender/editors/transform/transform_ops.c
M	source/blender/editors/transform/transform_orientations.c
M	source/blender/editors/util/CMakeLists.txt
M	source/blender/editors/util/SConscript
M	source/blender/editors/util/ed_util.c
M	source/blender/editors/util/undo.c
M	source/blender/editors/uvedit/CMakeLists.txt
M	source/blender/editors/uvedit/SConscript
M	source/blender/editors/uvedit/uvedit_buttons.c
M	source/blender/editors/uvedit/uvedit_ops.c
M	source/blender/imbuf/intern/thumbs_font.c
M	source/blender/makesrna/SConscript
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/makesrna/intern/SConscript
M	source/blender/makesrna/intern/rna_access.c
M	source/blender/makesrna/intern/rna_actuator.c
M	source/blender/makesrna/intern/rna_constraint.c
M	source/blender/makesrna/intern/rna_controller.c
M	source/blender/makesrna/intern/rna_curve.c
M	source/blender/makesrna/intern/rna_define.c
M	source/blender/makesrna/intern/rna_gpencil.c
M	source/blender/makesrna/intern/rna_key.c
M	source/blender/makesrna/intern/rna_lamp.c
M	source/blender/makesrna/intern/rna_main_api.c
M	source/blender/makesrna/intern/rna_mask.c
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/makesrna/intern/rna_nodetree.c
M	source/blender/makesrna/intern/rna_particle.c
M	source/blender/makesrna/intern/rna_pose.c
M	source/blender/makesrna/intern/rna_property.c
M	source/blender/makesrna/intern/rna_scene.c
M	source/blender/makesrna/intern/rna_sensor.c
M	source/blender/makesrna/intern/rna_sequencer.c
M	source/blender/makesrna/intern/rna_space.c
M	source/blender/makesrna/intern/rna_speaker.c
M	source/blender/makesrna/intern/rna_text.c
M	source/blender/makesrna/intern/rna_ui.c
M	source/blender/makesrna/intern/rna_ui_api.c
M	source/blender/makesrna/intern/rna_userdef.c
M	source/blender/makesrna/intern/rna_wm.c
M	source/blender/nodes/CMakeLists.txt
M	source/blender/nodes/SConscript
M	source/blender/nodes/composite/node_composite_tree.c
M	source/blender/nodes/composite/node_composite_util.h
M	source/blender/nodes/composite/nodes/node_composite_keying.c
M	source/blender/nodes/intern/node_common.c
M	source/blender/nodes/intern/node_util.c
M	source/blender/nodes/shader/node_shader_tree.c
M	source/blender/nodes/shader/node_shader_util.h
M	source/blender/nodes/texture/node_texture_tree.c
M	source/blender/nodes/texture/node_texture_util.h
M	source/blender/python/SConscript
M	source/blender/python/intern/CMakeLists.txt
M	source/blender/python/intern/bpy_app_translations.c
M	source/blender/python/intern/bpy_util.c
M	source/blender/render/CMakeLists.txt
M	source/blender/render/SConscript
M	source/blender/render/intern/source/convertblender.c
M	source/blender/render/intern/source/envmap.c
M	source/blender/render/intern/source/external_engine.c
M	source/blender/render/intern/source/occlusion.c
M	source/blender/render/intern/source/pipeline.c
M	source/blender/render/intern/source/pointdensity.c
M	source/blender/render/intern/source/rayshade.c
M	source/blender/render/intern/source/sss.c
M	source/blender/render/intern/source/volume_precache.c
M	source/blender/render/intern/source/voxeldata.c
M	source/blender/windowmanager/CMakeLists.txt
M	source/blender/windowmanager/SConscript
M	source/blender/windowmanager/intern/wm_dragdrop.c
M	source/blender/windowmanager/intern/wm_files.c
M	source/blender/windowmanager/intern/wm_init_exit.c
M	source/blender/windowmanager/intern/wm_keymap.c
M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/intern/wm_window.c
M	source/blenderplayer/CMakeLists.txt
M	source/gameengine/GamePlayer/ghost/CMakeLists.txt
M	source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
M	source/gameengine/GamePlayer/ghost/SConscript

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index e7fc0ec..5a870aa 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -591,6 +591,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		ge_videotex
 		bf_dna
 		bf_blenfont
+		bf_blentranslation
 		bf_intern_audaspace
 		bf_intern_mikktspace
 		bf_intern_dualcon
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 9a73921..e36f9e2 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -101,6 +101,7 @@ add_subdirectory(blenlib)
 add_subdirectory(bmesh)
 add_subdirectory(render)
 add_subdirectory(blenfont)
+add_subdirectory(blentranslation)
 add_subdirectory(blenloader)
 add_subdirectory(depsgraph)
 add_subdirectory(ikplugin)
diff --git a/source/blender/SConscript b/source/blender/SConscript
index e987b6b..c6f4994 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -33,6 +33,7 @@ SConscript(['avi/SConscript',
             'blenkernel/SConscript',
             'blenlib/SConscript',
             'blenloader/SConscript',
+            'blentranslation/SConscript',
             'depsgraph/SConscript',
             'gpu/SConscript',
             'editors/SConscript',
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 09734bd..d8dee71 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -192,6 +192,12 @@ void BLF_thumb_preview(
         const float font_color[4], const int font_size,
         unsigned char *buf, int w, int h, int channels) ATTR_NONNULL();
 
+/* blf_font_i18.c */
+unsigned char *BLF_get_unifont(int *unifont_size);
+void           BLF_free_unifont(void);
+unsigned char *BLF_get_unifont_mono(int *unifont_size);
+void           BLF_free_unifont_mono(void);
+
 #ifdef DEBUG
 void BLF_state_print(int fontid);
 #endif
diff --git a/source/blender/blenfont/BLF_translation.h b/source/blender/blenfont/BLF_translation.h
deleted file mode 100644
index c9b0c25..0000000
--- a/source/blender/blenfont/BLF_translation.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * ***** 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) 2011 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation,
- *                 Sergey Sharybin
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/blenfont/BLF_translation.h
- *  \ingroup blf
- */
-
-
-#ifndef __BLF_TRANSLATION_H__
-#define __BLF_TRANSLATION_H__
-
-#include "BLI_utildefines.h"  /* for bool type */
-
-#define TEXT_DOMAIN_NAME "blender"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* blf_lang.c */
-
-/* Search the path directory to the locale files, this try all
- * the case for Linux, Win and Mac.
- * Also dynamically builds locales and locales' menu from "languages" text file.
- */
-void BLF_lang_init(void);
-
-/* Free languages and locales_menu arrays created by BLF_lang_init. */
-void BLF_lang_free(void);
-
-/* Set the current locale. */
-void BLF_lang_set(const char *);
-/* Get the current locale ([partial] ISO code, e.g. es_ES). */
-const char *BLF_lang_get(void);
-
-/* Get locale's elements (if relevant pointer is not NULL and element actually exists, e.g. if there is no variant,
- * *variant and *language_variant will always be NULL).
- * Non-null elements are always MEM_mallocN'ed, it's the caller's responsibility to free them.
- * NOTE: Always available, even in non-WITH_INTERNATIONAL builds.
- */
-void BLF_locale_explode(const char *locale, char **language, char **country, char **variant,
-                        char **language_country, char **language_variant);
-
-/* Get EnumPropertyItem's for translations menu. */
-struct EnumPropertyItem *BLF_RNA_lang_enum_properties(void);
-
-/* blf_translation.c  */
-
-unsigned char *BLF_get_unifont(int *unifont_size);
-void BLF_free_unifont(void);
-unsigned char *BLF_get_unifont_mono(int *unifont_size);
-void BLF_free_unifont_mono(void);
-
-bool BLF_is_default_context(const char *msgctxt);
-const char *BLF_pgettext(const char *msgctxt, const char *msgid);
-
-/* translation */
-bool BLF_translate(void);
-bool BLF_translate_iface(void);
-bool BLF_translate_tooltips(void);
-bool BLF_translate_new_dataname(void);
-const char *BLF_translate_do(const char *msgctxt, const char *msgid);
-const char *BLF_translate_do_iface(const char *msgctxt, const char *msgid);
-const char *BLF_translate_do_tooltip(const char *msgctxt, const char *msgid);
-const char *BLF_translate_do_new_dataname(const char *msgctxt, const char *msgid);
-
-
-/* The "translation-marker" macro. */
-#define N_(msgid) msgid
-#define CTX_N_(context, msgid) msgid
-
-/* Those macros should be used everywhere in UI code. */
-#ifdef WITH_INTERNATIONAL
-/*#  define _(msgid) BLF_gettext(msgid) */
-#  define IFACE_(msgid) BLF_translate_do_iface(NULL, msgid)
-#  define TIP_(msgid) BLF_translate_do_tooltip(NULL, msgid)
-#  define DATA_(msgid) BLF_translate_do_new_dataname(NULL, msgid)
-#  define CTX_IFACE_(context, msgid) BLF_translate_do_iface(context, msgid)
-#  define CTX_TIP_(context, msgid) BLF_translate_do_tooltip(context, msgid)
-#  define CTX_DATA_(context, msgid) BLF_translate_do_new_dataname(context, msgid)
-#else
-/*#  define _(msgid) msgid */
-#  define IFACE_(msgid) msgid
-#  define TIP_(msgid)   msgid
-#  define DATA_(msgid)  msgid
-#  define CTX_IFACE_(context, msgid) msgid
-#  define CTX_TIP_(context, msgid)   msgid
-#  define CTX_DATA_(context, msgid)  msgid
-#endif
-
-/* Helper macro, when we want to define a same msgid for multiple msgctxt...
- * Does nothing in C, but is "parsed" by our i18n py tools.
- * XXX Currently limited to at most 16 contexts at once
- *     (but you can call it several times with the same msgid, should you need more contexts!).
- */
-#define BLF_I18N_MSGID_MULTI_CTXT(msgid, ...)
-
-/******************************************************************************
- * All i18n contexts must be defined here.
- * This is a nice way to be sure not to use a context twice for different
- * things, and limit the number of existing contexts!
- * WARNING! Contexts should not be longer than BKE_ST_MAXNAME - 1!
- */
-
-/* Default, void context.
- * WARNING! The "" context is not the same as no (NULL) context at mo/boost::locale level!
- * NOTE: We translate BLF_I18NCONTEXT_DEFAULT as BLF_I18NCONTEXT_DEFAULT_BPY in Python, as we can't use "natural"
- *       None value in rna string properties... :/
- *       The void string "" is also interpreted as BLF_I18NCONTEXT_DEFAULT.
- *       For perf reason, we only use the first char to detect this context, so other contexts should never start
- *       with the same char!
- */
-#define BLF_I18NCONTEXT_DEFAULT NULL
-#define BLF_I18NCONTEXT_DEFAULT_BPYRNA "*"
-
-/* Default context for operator names/labels. */
-#define BLF_I18NCONTEXT_OPERATOR_DEFAULT "Operator"
-
-/* Mark the msgid applies to several elements (needed in some cases, as english adjectives have no plural mark. :( */
-#define BLF_I18NCONTEXT_PLURAL "Plural"
-
-/* ID-types contexts. */
-/* WARNING! Keep it in sync with idtypes in blenkernel/intern/idcode.c */
-#define BLF_I18NCONTEXT_ID_ACTION               "Action"
-#define BLF_I18NCONTEXT_ID_ARMATURE             "Armature"
-#define BLF_I18NCONTEXT_ID_BRUSH                "Brush"
-#define BLF_I18NCONTEXT_ID_CAMERA               "Camera"
-#define BLF_I18NCONTEXT_ID_CURVE                "Curve"
-#define BLF_I18NCONTEXT_ID_FREESTYLELINESTYLE   "FreestyleLineStyle"
-#define BLF_I18NCONTEXT_ID_GPENCIL              "GPencil"
-#define BLF_I18NCONTEXT_ID_GROUP                "Group"
-#define BLF_I18NCONTEXT_ID_ID                   "ID"
-#define BLF_I18NCONTEXT_ID_IMAGE                "Image"
-/*#define BLF_I18NCONTEXT_ID_IPO                  "Ipo"*/ /* Deprecated */
-#define BLF_I18NCONTEXT_ID_SHAPEKEY             "Key"
-#define BLF_I18NCONTEXT_ID_LAMP                 "Lamp"
-#define BLF_I18NCONTEXT_ID_LIBRARY              "Library"
-#define BLF_I18NCONTEXT_ID_LATTICE              "Lattice"
-#define BLF_I18NCONTEXT_ID_MATERIAL             "Material"
-#define BLF_I18NCONTEXT_ID_METABALL             "Metaball"
-#define BLF_I18NCONTEXT_ID_MESH                 "Mesh"
-#define BLF_I18NCONTEXT_ID_NODETREE             "NodeTree"
-#define BLF_I18NCONTEXT_ID_OBJECT               "Object"
-#define BLF_I18NCONTEXT_ID_PAINTCURVE           "PaintCurve"
-#define BLF_I18NCONTEXT_ID_PALETTE              "Palette"
-#define BLF_I18NCONTEXT_ID_PARTICLESETTINGS     "ParticleSettings"
-#define BLF_I18NCONTEXT_ID_SCENE                "Scene"
-#define BLF_I18NCONTEXT_ID_SCREEN               "Screen"
-#define BLF_I18NCONTEXT_ID_SEQUENCE             "Sequence"
-#define BLF_I18NCONTEXT_ID_SPEAKER              "Speaker"
-#define BLF_I18NCONTEXT_ID_SOUND                "Sound"
-#define BLF_I18NCONTEXT_ID_TEXTURE              "Texture"
-#define BLF_I18NCONTEXT_ID_TEXT                 "Text"
-#define BLF_I18NCONTEXT_ID_VFONT                "VFont"
-#define BLF_I18NCONTEXT_ID_WORLD                "World"
-#define BLF_I18NCONTEXT_ID_WINDOWMANAGER        "WindowManager"
-#define BLF_I18NCONTEXT_ID_MOVIECLIP            "MovieClip"
-#define BLF_I18NCONTEXT_ID_MASK                 "Mask"
-
-/* Helper for bpy.app.i18n object... */
-typedef struct {
-	const char *c_id;
-	const char *py_id;
-	const char *value;
-} BLF_i18n_contexts_descriptor;
-
-#define BLF_I18NCONTEXTS_ITEM(ctxt_id, py_id) {#ctxt_id, py_id, ctxt_id}
-
-#define BLF_I18NCONT

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list