diff options
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/nodes/SConscript | 2 | ||||
-rw-r--r-- | source/blender/nodes/composite/node_composite_tree.c | 22 | ||||
-rw-r--r-- | source/blender/nodes/shader/node_shader_tree.c | 20 | ||||
-rw-r--r-- | source/blender/nodes/texture/node_texture_tree.c | 20 |
5 files changed, 36 insertions, 29 deletions
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 557b00d66b8..368ab1db50c 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -25,6 +25,7 @@ set(INC . + ../blenfont ../blenkernel ../blenlib ../blenloader diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index 0cbc7b80933..d7dbed51282 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -11,7 +11,7 @@ incs += '#/intern/guardedalloc ../editors/include ../blenlib ../makesdna' incs += ' ../render/extern/include ../makesrna ' incs += ' ../imbuf ../avi ' incs += ' ../blenloader' -incs += ' ../blenkernel ../renderconverter ' +incs += ' ../blenfont ../blenkernel ../renderconverter ' incs += ' ../gpu #/extern/glew/include ' incs += ' ' + env['BF_OPENGL_INC'] diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 06f88002a70..10b062977b2 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -39,6 +39,8 @@ #include "BLI_listbase.h" #include "BLI_threads.h" +#include "BLF_translation.h" + #include "BKE_animsys.h" #include "BKE_colortools.h" #include "BKE_fcurve.h" @@ -70,16 +72,16 @@ static void foreach_nodetree(Main *main, void *calldata, bNodeTreeCallback func) static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCallback func) { - func(calldata, NODE_CLASS_INPUT, "Input"); - func(calldata, NODE_CLASS_OUTPUT, "Output"); - func(calldata, NODE_CLASS_OP_COLOR, "Color"); - func(calldata, NODE_CLASS_OP_VECTOR, "Vector"); - func(calldata, NODE_CLASS_OP_FILTER, "Filter"); - func(calldata, NODE_CLASS_CONVERTOR, "Convertor"); - func(calldata, NODE_CLASS_MATTE, "Matte"); - func(calldata, NODE_CLASS_DISTORT, "Distort"); - func(calldata, NODE_CLASS_GROUP, "Group"); - func(calldata, NODE_CLASS_LAYOUT, "Layout"); + func(calldata, NODE_CLASS_INPUT, IFACE_("Input")); + func(calldata, NODE_CLASS_OUTPUT, IFACE_("Output")); + func(calldata, NODE_CLASS_OP_COLOR, IFACE_("Color")); + func(calldata, NODE_CLASS_OP_VECTOR, IFACE_("Vector")); + func(calldata, NODE_CLASS_OP_FILTER, IFACE_("Filter")); + func(calldata, NODE_CLASS_CONVERTOR, IFACE_("Convertor")); + func(calldata, NODE_CLASS_MATTE, IFACE_("Matte")); + func(calldata, NODE_CLASS_DISTORT, IFACE_("Distort")); + func(calldata, NODE_CLASS_GROUP, IFACE_("Group")); + func(calldata, NODE_CLASS_LAYOUT, IFACE_("Layout")); } static void free_node_cache(bNodeTree *UNUSED(ntree), bNode *node) diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index e116944e688..6c7667c6729 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -43,6 +43,8 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" +#include "BLF_translation.h" + #include "BKE_global.h" #include "BKE_main.h" #include "BKE_node.h" @@ -78,19 +80,19 @@ static void foreach_nodetree(Main *main, void *calldata, bNodeTreeCallback func) static void foreach_nodeclass(Scene *scene, void *calldata, bNodeClassCallback func) { - func(calldata, NODE_CLASS_INPUT, "Input"); - func(calldata, NODE_CLASS_OUTPUT, "Output"); + func(calldata, NODE_CLASS_INPUT, IFACE_("Input")); + func(calldata, NODE_CLASS_OUTPUT, IFACE_("Output")); if(scene_use_new_shading_nodes(scene)) { - func(calldata, NODE_CLASS_SHADER, "Shader"); - func(calldata, NODE_CLASS_TEXTURE, "Texture"); + func(calldata, NODE_CLASS_SHADER, IFACE_("Shader")); + func(calldata, NODE_CLASS_TEXTURE, IFACE_("Texture")); } - func(calldata, NODE_CLASS_OP_COLOR, "Color"); - func(calldata, NODE_CLASS_OP_VECTOR, "Vector"); - func(calldata, NODE_CLASS_CONVERTOR, "Convertor"); - func(calldata, NODE_CLASS_GROUP, "Group"); - func(calldata, NODE_CLASS_LAYOUT, "Layout"); + func(calldata, NODE_CLASS_OP_COLOR, IFACE_("Color")); + func(calldata, NODE_CLASS_OP_VECTOR, IFACE_("Vector")); + func(calldata, NODE_CLASS_CONVERTOR, IFACE_("Convertor")); + func(calldata, NODE_CLASS_GROUP, IFACE_("Group")); + func(calldata, NODE_CLASS_LAYOUT, IFACE_("Layout")); } static void local_sync(bNodeTree *localtree, bNodeTree *ntree) diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index 84bb53e2215..e863e9f6e0f 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -39,6 +39,8 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" +#include "BLF_translation.h" + #include "BKE_global.h" #include "BKE_main.h" #include "BKE_node.h" @@ -64,15 +66,15 @@ static void foreach_nodetree(Main *main, void *calldata, bNodeTreeCallback func) static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCallback func) { - func(calldata, NODE_CLASS_INPUT, "Input"); - func(calldata, NODE_CLASS_OUTPUT, "Output"); - func(calldata, NODE_CLASS_OP_COLOR, "Color"); - func(calldata, NODE_CLASS_PATTERN, "Patterns"); - func(calldata, NODE_CLASS_TEXTURE, "Textures"); - func(calldata, NODE_CLASS_CONVERTOR, "Convertor"); - func(calldata, NODE_CLASS_DISTORT, "Distort"); - func(calldata, NODE_CLASS_GROUP, "Group"); - func(calldata, NODE_CLASS_LAYOUT, "Layout"); + func(calldata, NODE_CLASS_INPUT, IFACE_("Input")); + func(calldata, NODE_CLASS_OUTPUT, IFACE_("Output")); + func(calldata, NODE_CLASS_OP_COLOR, IFACE_("Color")); + func(calldata, NODE_CLASS_PATTERN, IFACE_("Patterns")); + func(calldata, NODE_CLASS_TEXTURE, IFACE_("Textures")); + func(calldata, NODE_CLASS_CONVERTOR, IFACE_("Convertor")); + func(calldata, NODE_CLASS_DISTORT, IFACE_("Distort")); + func(calldata, NODE_CLASS_GROUP, IFACE_("Group")); + func(calldata, NODE_CLASS_LAYOUT, IFACE_("Layout")); } static void local_sync(bNodeTree *localtree, bNodeTree *ntree) |