Merged changes in the trunk up to revision 55357.
[blender.git] / source / blender / makesrna / intern / rna_scene.c
index b9f0632497f8d398cc926dee8285432273e84859..23a3c2188da2d20dc1e3dd20784dec189e275f0d 100644 (file)
 
 #include <stdlib.h>
 
-#include "RNA_define.h"
-#include "RNA_enum_types.h"
-
-#include "rna_internal.h"
-
 #include "DNA_brush_types.h"
 #include "DNA_group_types.h"
 #include "DNA_modifier_types.h"
 
 #include "BKE_tessmesh.h"
 
+#include "RNA_define.h"
+#include "RNA_enum_types.h"
+
+#include "rna_internal.h"
+
 /* Include for Bake Options */
 #include "RE_engine.h"
 #include "RE_pipeline.h"
@@ -916,16 +916,13 @@ static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bCon
        EnumPropertyItem tmp = {0, "", 0, "", ""};
        QuicktimeCodecTypeDesc *codecTypeDesc;
        int i = 1, totitem = 0;
-       char id[5];
-       
+
        for (i = 0; i < quicktime_get_num_videocodecs(); i++) {
                codecTypeDesc = quicktime_get_videocodecType_desc(i);
                if (!codecTypeDesc) break;
-               
+
                tmp.value = codecTypeDesc->rnatmpvalue;
-               *((int *)id) = codecTypeDesc->codecType;
-               id[4] = 0;
-               tmp.identifier = id;
+               tmp.identifier = codecTypeDesc->codecName;
                tmp.name = codecTypeDesc->codecName;
                RNA_enum_item_add(&item, &totitem, &tmp);
        }
@@ -1586,8 +1583,8 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 
        static EnumPropertyItem draw_groupuser_items[] = {
                {OB_DRAW_GROUPUSER_NONE, "NONE", 0, "None", ""},
-               {OB_DRAW_GROUPUSER_ACTIVE, "ACTIVE", 0, "Active", "Show vertices with no weights in the actuve group"},
-               {OB_DRAW_GROUPUSER_ALL, "ALL", 0, "All", "Show vertices with no weights in the any group"},
+               {OB_DRAW_GROUPUSER_ACTIVE, "ACTIVE", 0, "Active", "Show vertices with no weights in the active group"},
+               {OB_DRAW_GROUPUSER_ALL, "ALL", 0, "All", "Show vertices with no weights in any group"},
                {0, NULL, 0, NULL, NULL}
        };
 
@@ -2501,9 +2498,9 @@ static void rna_def_freestyle_settings(BlenderRNA *brna)
        RNA_def_property_update(prop, NC_SCENE, NULL);
        RNA_def_struct_name_property(srna, prop);
 
-       prop = RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE);
+       prop = RNA_def_property(srna, "show_render", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flags", FREESTYLE_LINESET_ENABLED);
-       RNA_def_property_ui_text(prop, "Use", "Enable or disable this line set during stroke rendering");
+       RNA_def_property_ui_text(prop, "Render", "Enable or disable this line set during stroke rendering");
        RNA_def_property_update(prop, NC_SCENE, NULL);
 
        prop = RNA_def_property(srna, "select_by_visibility", PROP_BOOLEAN, PROP_NONE);
@@ -3581,8 +3578,9 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna)
                {CODEC_ID_THEORA, "THEORA", 0, "Theora", ""},
                {CODEC_ID_FLV1, "FLASH", 0, "Flash Video", ""},
                {CODEC_ID_FFV1, "FFV1", 0, "FFmpeg video codec #1", ""},
-               {CODEC_ID_QTRLE, "QTRLE", 0, "QTRLE", ""},
+               {CODEC_ID_QTRLE, "QTRLE", 0, "QT rle / QT Animation", ""},
                {CODEC_ID_DNXHD, "DNXHD", 0, "DNxHD", ""},
+               {CODEC_ID_PNG, "PNG", 0, "PNG", ""},
                {0, NULL, 0, NULL, NULL}
        };