Small fixes to languages names (thx to Dalai Felinto for the hints), and enable build...
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 18 Sep 2012 07:03:23 +0000 (07:03 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 18 Sep 2012 07:03:23 +0000 (07:03 +0000)
source/blender/editors/io/io_collada.c
source/blender/makesrna/intern/rna_userdef.c

index 0e6b8f7752822ba862270fe1938ceeef0297f27f..2000f1121d65125ab59cbbeb4d8e35c488512acc 100644 (file)
@@ -54,6 +54,8 @@
 
 #include "../../collada/collada.h"
 
+#include "io_collada.h"
+
 static int wm_collada_export_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
 {      
        if (!RNA_struct_property_is_set(op->ptr, "filepath")) {
@@ -121,24 +123,23 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
        /* get editmode results */
        ED_object_exit_editmode(C, 0);  /* 0 = does not exit editmode */
 
-       if (collada_export(
-               CTX_data_scene(C),
-               filepath,
-               apply_modifiers,
-                       export_mesh_type,
-               selected,
-               include_children,
-               include_armatures,
-               deform_bones_only,
-
-                       active_uv_only,
-                       include_uv_textures,
-                       include_material_textures,
-                       use_texture_copies,
-
-               use_object_instantiation,
-               sort_by_name,
-               second_life)) {
+       if (collada_export(CTX_data_scene(C),
+                          filepath,
+                          apply_modifiers,
+                          export_mesh_type,
+                          selected,
+                          include_children,
+                          include_armatures,
+                          deform_bones_only,
+
+                          active_uv_only,
+                          include_uv_textures,
+                          include_material_textures,
+                          use_texture_copies,
+
+                          use_object_instantiation,
+                          sort_by_name,
+                          second_life)) {
                return OPERATOR_FINISHED;
        }
        else {
@@ -146,6 +147,9 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
        }
 }
 
+/* Prototype now needed, it seems... Else gcc in paranoid warning=error mode fails to build! */
+void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr);
+
 void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr)
 {
        uiLayout *box, *row, *col, *split;
@@ -233,7 +237,7 @@ void WM_OT_collada_export(wmOperatorType *ot)
        ot->name = "Export COLLADA";
        ot->description = "Save a Collada file";
        ot->idname = "WM_OT_collada_export";
-       
+
        ot->invoke = wm_collada_export_invoke;
        ot->exec = wm_collada_export_exec;
        ot->poll = WM_operator_winactive;
@@ -241,7 +245,7 @@ void WM_OT_collada_export(wmOperatorType *ot)
        ot->flag |= OPTYPE_PRESET;
 
        ot->ui = wm_collada_export_draw;
-       
+
        WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE, FILE_BLENDER, FILE_SAVE,
                                       WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
 
@@ -296,7 +300,7 @@ void WM_OT_collada_export(wmOperatorType *ot)
 static int wm_collada_import_exec(bContext *C, wmOperator *op)
 {
        char filename[FILE_MAX];
-       
+
        if (!RNA_struct_property_is_set(op->ptr, "filepath")) {
                BKE_report(op->reports, RPT_ERROR, "No filename given");
                return OPERATOR_CANCELLED;
@@ -304,9 +308,9 @@ static int wm_collada_import_exec(bContext *C, wmOperator *op)
 
        RNA_string_get(op->ptr, "filepath", filename);
        if (collada_import(C, filename)) return OPERATOR_FINISHED;
-       
+
        BKE_report(op->reports, RPT_ERROR, "Errors found during parsing COLLADA document. Please see console for error log.");
-       
+
        return OPERATOR_FINISHED;
 }
 
@@ -315,11 +319,11 @@ void WM_OT_collada_import(wmOperatorType *ot)
        ot->name = "Import COLLADA";
        ot->description = "Load a Collada file";
        ot->idname = "WM_OT_collada_import";
-       
+
        ot->invoke = WM_operator_filesel;
        ot->exec = wm_collada_import_exec;
        ot->poll = WM_operator_winactive;
-       
+
        WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE, FILE_BLENDER, FILE_OPENFILE,
                                       WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
 }
index 666fa4d7b818cdc703e06381a9ff19bc1e5e84fe..1b77617182a875ac7fc6a2258425da06cd663ca1 100644 (file)
@@ -2984,7 +2984,7 @@ static void rna_def_userdef_system(BlenderRNA *brna)
        /* Note: As this list is in alphabetical order, and not defined order,
         *       here is the highest define currently in use: 33 (Hebrew). */
        static EnumPropertyItem language_items[] = {
-               { 0, "", 0, N_("Nearly done"), ""},
+               { 0, "", 0, N_("Nearly Done"), ""},
                { 0, "DEFAULT", 0, "Default (Default)", ""},
                {21, "ARABIC", 0, "Arabic (ﺔﻴﺑﺮﻌﻟﺍ)", "ar_EG"},
                {32, "BRAZILIANPORTUGUESE", 0, "Brazilian Portuguese (Português do Brasil)", "pt_BR"},
@@ -2998,7 +2998,7 @@ static void rna_def_userdef_system(BlenderRNA *brna)
                { 9, "SPANISH", 0, "Spanish (Español)", "es"},
                {14, "TRADITIONAL_CHINESE", 0, "Traditional Chinese (繁體中文)", "zh_TW"},
                {18, "UKRAINIAN", 0, "Ukrainian (Український)", "uk_UA"},
-               { 0, "", 0, N_("In progress"), ""},
+               { 0, "", 0, N_("In Progress"), ""},
                /* using the utf8 flipped form of Arabic (العربية) */
                {22, "BULGARIAN", 0, "Bulgarian (Български)", "bg_BG"},
                {10, "CATALAN", 0, "Catalan (Català)", "ca_AD"},
@@ -3009,7 +3009,7 @@ static void rna_def_userdef_system(BlenderRNA *brna)
                { 5, "GERMAN", 0, "German (Deutsch)", "de_DE"},
                {23, "GREEK", 0, "Greek (Ελληνικά)", "el_GR"},
                {33, "HEBREW", 0, "Hebrew (עִבְרִית)", "he_IL"},
-               {31, "HUNGARIAN", 0, "Hungarian (magyar)", "hu_HU"},
+               {31, "HUNGARIAN", 0, "Hungarian (Magyar)", "hu_HU"},
                {27, "INDONESIAN", 0, "Indonesian (Bahasa indonesia)", "id_ID"},
                {29, "KYRGYZ", 0, "Kyrgyz (Кыргыз тили)", "ky_KG"},
 /*             {24, "KOREAN", 0, "Korean (한국 언어)", "ko_KR"}, */ /* XXX No po's yet. */
@@ -3019,7 +3019,7 @@ static void rna_def_userdef_system(BlenderRNA *brna)
                {19, "POLISH", 0, "Polish (Polski)", "pl_PL"},
 /*             {20, "ROMANIAN", 0, "Romanian (Român)", "ro_RO"}, */ /* XXX No po's yet. */
                {17, "SERBIAN", 0, "Serbian (Српски)", "sr_RS"},
-               {28, "SERBIAN_LATIN", 0, "Serbian latin (Srpski latinica)", "sr_RS@latin"},
+               {28, "SERBIAN_LATIN", 0, "Serbian Latin (Srpski latinica)", "sr_RS@latin"},
                { 7, "SWEDISH", 0, "Swedish (Svenska)", "sv_SE"},
                {30, "TURKISH", 0, "Turkish (Türkçe)", "tr_TR"},
                { 0, NULL, 0, NULL, NULL}