A final bunch of UI messages fixes and tweaks, and some BKE_report()<->BKE_reportf...
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 21 Oct 2012 14:02:30 +0000 (14:02 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 21 Oct 2012 14:02:30 +0000 (14:02 +0000)
27 files changed:
intern/cycles/blender/addon/properties.py
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/packedFile.c
source/blender/blenkernel/intern/writeavi.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenkernel/intern/writeframeserver.c
source/blender/blenlib/intern/bpath.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_animation_api.c
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_image_api.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_ui.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm.c
source/blender/modifiers/intern/MOD_decimate.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c

index 5c68b7f..0b8ca6e 100644 (file)
@@ -291,9 +291,9 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         cls.use_progressive_refine = BoolProperty(
                 name="Progressive Refine",
                 description="Instead of rendering each tile until it is finished, "
-                            "refine the whole image progressively. "
-                            "This renders somewhat slower, "
-                            "but time can be saved by manually stopping the render when the noise is low enough",
+                            "refine the whole image progressively "
+                            "(this renders somewhat slower, "
+                            "but time can be saved by manually stopping the render when the noise is low enough)",
                 default=False,
                 )
 
index 0a403c3..dffe26b 100644 (file)
@@ -176,7 +176,7 @@ bMotionPath *animviz_verify_motionpaths(ReportList *reports, Scene *scene, Objec
        /* avoid 0 size allocs */
        if (avs->path_sf >= avs->path_ef) {
                BKE_reportf(reports, RPT_ERROR,
-                           "Motion Path frame extents invalid for %s (%d to %d)%s",
+                           "Motion path frame extents invalid for %s (%d to %d)%s",
                            (pchan) ? pchan->name : ob->id.name,
                            avs->path_sf, avs->path_ef,
                            (avs->path_sf == avs->path_ef) ? TIP_(", cannot have single-frame paths") : "");
index b4c5747..b84ec10 100644 (file)
@@ -159,7 +159,7 @@ short BKE_animdata_set_action(ReportList *reports, ID *id, bAction *act)
        
        /* animdata validity check */
        if (adt == NULL) {
-               BKE_report(reports, RPT_WARNING, "No AnimData to set action on");
+               BKE_report(reports, RPT_WARNING, "No anim data to set action on");
                return ok;
        }
        
@@ -188,9 +188,9 @@ short BKE_animdata_set_action(ReportList *reports, ID *id, bAction *act)
                else {
                        /* cannot set */
                        BKE_reportf(reports, RPT_ERROR,
-                                   "Couldn't set Action '%s' onto ID '%s', as it doesn't have suitably rooted paths for this purpose",
-                                   act->id.name + 2, id->name);
-                       //ok = 0;
+                                   "Could not set action '%s' onto ID '%s', as it does not have suitably rooted paths "
+                                   "for this purpose", act->id.name + 2, id->name);
+                       /* ok = 0; */
                }
        }
        else {
index a5b90c0..5257137 100644 (file)
@@ -338,7 +338,7 @@ static int handle_subversion_warning(Main *main, ReportList *reports)
            (main->minversionfile == BLENDER_VERSION &&
             main->minsubversionfile > BLENDER_SUBVERSION))
        {
-               BKE_reportf(reports, RPT_ERROR, "File written by newer Blender binary: %d.%d, expect loss of data!",
+               BKE_reportf(reports, RPT_ERROR, "File written by newer Blender binary (%d.%d), expect loss of data!",
                            main->minversionfile, main->minsubversionfile);
        }
 
@@ -409,7 +409,7 @@ int BKE_read_file(bContext *C, const char *filepath, ReportList *reports)
                        setup_app_data(C, bfd, filepath);  // frees BFD
        }
        else
-               BKE_reports_prependf(reports, "Loading %s failed: ", filepath);
+               BKE_reports_prependf(reports, "Loading '%s' failed: ", filepath);
                
        return (bfd ? retval : BKE_READ_FILE_FAIL);
 }
index f16748b..dec49f4 100644 (file)
@@ -201,7 +201,7 @@ PackedFile *newPackedFile(ReportList *reports, const char *filename, const char
 
        file = BLI_open(name, O_BINARY | O_RDONLY, 0);
        if (file <= 0) {
-               BKE_reportf(reports, RPT_ERROR, "Unable to pack file, source path not found: \"%s\"", name);
+               BKE_reportf(reports, RPT_ERROR, "Unable to pack file, source path '%s' not found", name);
        }
        else {
                filelen = BLI_file_descriptor_size(file);
@@ -311,20 +311,20 @@ int writePackedFile(ReportList *reports, const char *filename, PackedFile *pf, i
        file = BLI_open(name, O_BINARY + O_WRONLY + O_CREAT + O_TRUNC, 0666);
        if (file >= 0) {
                if (write(file, pf->data, pf->size) != pf->size) {
-                       BKE_reportf(reports, RPT_ERROR, "Error writing file: %s", name);
+                       BKE_reportf(reports, RPT_ERROR, "Error writing file '%s'", name);
                        ret_value = RET_ERROR;
                }
                close(file);
        }
        else {
-               BKE_reportf(reports, RPT_ERROR, "Error creating file: %s", name);
+               BKE_reportf(reports, RPT_ERROR, "Error creating file '%s'", name);
                ret_value = RET_ERROR;
        }
        
        if (remove_tmp) {
                if (ret_value == RET_ERROR) {
                        if (BLI_rename(tempname, name) != 0) {
-                               BKE_reportf(reports, RPT_ERROR, "Error restoring temp file. Check files: '%s' '%s'", tempname, name);
+                               BKE_reportf(reports, RPT_ERROR, "Error restoring temp file (check files '%s' '%s')", tempname, name);
                        }
                }
                else {
index 9f29cb8..1b56241 100644 (file)
@@ -162,7 +162,7 @@ static int start_avi(Scene *scene, RenderData *rd, int rectx, int recty, ReportL
        else format = AVI_FORMAT_MJPEG;
 
        if (AVI_open_compress(name, avi, 1, format) != AVI_ERROR_NONE) {
-               BKE_report(reports, RPT_ERROR, "Cannot open or start AVI movie file.");
+               BKE_report(reports, RPT_ERROR, "Cannot open or start AVI movie file");
                MEM_freeN(avi);
                avi = NULL;
                return 0;
index 5fd7909..3a8a142 100644 (file)
@@ -289,7 +289,7 @@ static int write_video_frame(RenderData *rd, int cfra, AVFrame *frame, ReportLis
        }
 
        if (!success)
-               BKE_report(reports, RPT_ERROR, "Error writing frame.");
+               BKE_report(reports, RPT_ERROR, "Error writing frame");
 
        return success;
 }
@@ -307,7 +307,7 @@ static AVFrame *generate_video_frame(uint8_t *pixels, ReportList *reports)
        if (c->pix_fmt != PIX_FMT_BGR32) {
                rgb_frame = alloc_picture(PIX_FMT_BGR32, width, height);
                if (!rgb_frame) {
-                       BKE_report(reports, RPT_ERROR, "Couldn't allocate temporary frame.");
+                       BKE_report(reports, RPT_ERROR, "Could not allocate temporary frame");
                        return NULL;
                }
        }
@@ -695,12 +695,12 @@ static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, Report
        
        exts = get_file_extensions(ffmpeg_type);
        if (!exts) {
-               BKE_report(reports, RPT_ERROR, "No valid formats found.");
+               BKE_report(reports, RPT_ERROR, "No valid formats found");
                return 0;
        }
        fmt = av_guess_format(NULL, exts[0], NULL);
        if (!fmt) {
-               BKE_report(reports, RPT_ERROR, "No valid formats found.");
+               BKE_report(reports, RPT_ERROR, "No valid formats found");
                return 0;
        }
 
@@ -795,7 +795,7 @@ static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, Report
                        if (error[0])
                                BKE_report(reports, RPT_ERROR, error);
                        else
-                               BKE_report(reports, RPT_ERROR, "Error initializing video stream.");
+                               BKE_report(reports, RPT_ERROR, "Error initializing video stream");
 
                        av_dict_free(&opts);
                        return 0;
@@ -805,20 +805,20 @@ static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, Report
        if (ffmpeg_audio_codec != CODEC_ID_NONE) {
                audio_stream = alloc_audio_stream(rd, fmt->audio_codec, of);
                if (!audio_stream) {
-                       BKE_report(reports, RPT_ERROR, "Error initializing audio stream.");
+                       BKE_report(reports, RPT_ERROR, "Error initializing audio stream");
                        av_dict_free(&opts);
                        return 0;
                }
        }
        if (!(fmt->flags & AVFMT_NOFILE)) {
                if (avio_open(&of->pb, name, AVIO_FLAG_WRITE) < 0) {
-                       BKE_report(reports, RPT_ERROR, "Could not open file for writing.");
+                       BKE_report(reports, RPT_ERROR, "Could not open file for writing");
                        av_dict_free(&opts);
                        return 0;
                }
        }
        if (avformat_write_header(of, NULL) < 0) {
-               BKE_report(reports, RPT_ERROR, "Could not initialize streams. Probably unsupported codec combination.");
+               BKE_report(reports, RPT_ERROR, "Could not initialize streams, probably unsupported codec combination");
                        av_dict_free(&opts);
                return 0;
        }
index d8fddb9..acbbcb0 100644 (file)
@@ -118,13 +118,13 @@ int BKE_frameserver_start(struct Scene *scene, RenderData *UNUSED(rd), int rectx
        (void)scene; /* unused */
 
        if (!startup_socket_system()) {
-               BKE_report(reports, RPT_ERROR, "Can't startup socket system");
+               BKE_report(reports, RPT_ERROR, "Cannot startup socket system");
                return 0;
        }
 
        if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
                shutdown_socket_system();
-               BKE_report(reports, RPT_ERROR, "Can't open socket");
+               BKE_report(reports, RPT_ERROR, "Cannot open socket");
                return 0;
        }
 
@@ -136,13 +136,13 @@ int BKE_frameserver_start(struct Scene *scene, RenderData *UNUSED(rd), int rectx
 
        if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
                shutdown_socket_system();
-               BKE_report(reports, RPT_ERROR, "Can't bind to socket");
+               BKE_report(reports, RPT_ERROR, "Cannot bind to socket");
                return 0;
        }
 
        if (listen(sock, SOMAXCONN) < 0) {
                shutdown_socket_system();
-               BKE_report(reports, RPT_ERROR, "Can't establish listen backlog");
+               BKE_report(reports, RPT_ERROR, "Cannot establish listen backlog");
                return 0;
        }
        connsock = -1;
index 1cb578d..8ae2b94 100644 (file)
@@ -85,7 +85,7 @@ static int checkMissingFiles_visit_cb(void *userdata, char *UNUSED(path_dst), co
        ReportList *reports = (ReportList *)userdata;
 
        if (!BLI_exists(path_src)) {
-               BKE_reportf(reports, RPT_WARNING, "Path Not Found \"%s\"", path_src);
+               BKE_reportf(reports, RPT_WARNING, "Path '%s' not found", path_src);
        }
 
        return FALSE;
@@ -122,7 +122,7 @@ static int makeFilesRelative_visit_cb(void *userdata, char *path_dst, const char
                        data->count_changed++;
                }
                else {
-                       BKE_reportf(data->reports, RPT_WARNING, "Path cant be made relative \"%s\"", path_src);
+                       BKE_reportf(data->reports, RPT_WARNING, "Path '%s' cannot be made relative", path_src);
                        data->count_failed++;
                }
                return TRUE;
@@ -144,7 +144,7 @@ void BLI_bpath_relative_convert(Main *bmain, const char *basedir, ReportList *re
        BLI_bpath_traverse_main(bmain, makeFilesRelative_visit_cb, 0, (void *)&data);
 
        BKE_reportf(reports, data.count_failed ? RPT_WARNING : RPT_INFO,
-                   "Total files %d|Changed %d|Failed %d",
+                   "Total files %d | Changed %d | Failed %d",
                    data.count_tot, data.count_changed, data.count_failed);
 }
 
@@ -164,7 +164,7 @@ static int makeFilesAbsolute_visit_cb(void *userdata, char *path_dst, const char
                        data->count_changed++;
                }
                else {
-                       BKE_reportf(data->reports, RPT_WARNING, "Path cant be made absolute \"%s\"", path_src);
+                       BKE_reportf(data->reports, RPT_WARNING, "Path '%s' cannot be made absolute", path_src);
                        data->count_failed++;
                }
                return TRUE;
@@ -187,7 +187,7 @@ void BLI_bpath_absolute_convert(Main *bmain, const char *basedir, ReportList *re
        BLI_bpath_traverse_main(bmain, makeFilesAbsolute_visit_cb, 0, (void *)&data);
 
        BKE_reportf(reports, data.count_failed ? RPT_WARNING : RPT_INFO,
-                   "Total files %d|Changed %d|Failed %d",
+                   "Total files %d | Changed %d | Failed %d",
                    data.count_tot, data.count_changed, data.count_failed);
 }
 
@@ -279,13 +279,13 @@ static int findMissingFiles_visit_cb(void *userdata, char *path_dst, const char
 
        if (filesize == -1) { /* could not open dir */
                BKE_reportf(data->reports, RPT_WARNING,
-                           "Could open directory \"%s\"",
+                           "Could not open directory '%s'",
                            BLI_path_basename(data->searchdir));
                return FALSE;
        }
        else if (found == FALSE) {
                BKE_reportf(data->reports, RPT_WARNING,
-                           "Could not find \"%s\" in \"%s\"",
+                           "Could not find '%s' in '%s'",
                            BLI_path_basename((char *)path_src), data->searchdir);
                return FALSE;
        }
index 90ac3dd..740f769 100644 (file)
@@ -409,22 +409,22 @@ typedef enum WT_ReplaceMode {
 } WT_ReplaceMode;
 
 static EnumPropertyItem WT_vertex_group_mode_item[] = {
-       {WT_REPLACE_ACTIVE_VERTEX_GROUP, "WT_REPLACE_ACTIVE_VERTEX_GROUP", 1, "Active", "Transfer active vertex group from selected to active mesh."},
-       {WT_REPLACE_ALL_VERTEX_GROUPS, "WT_REPLACE_ALL_VERTEX_GROUPS", 1, "All", "Transfer all vertex groups from selected to active mesh."},
+       {WT_REPLACE_ACTIVE_VERTEX_GROUP, "WT_REPLACE_ACTIVE_VERTEX_GROUP", 1, "Active", "Transfer active vertex group from selected to active mesh"},
+       {WT_REPLACE_ALL_VERTEX_GROUPS, "WT_REPLACE_ALL_VERTEX_GROUPS", 1, "All", "Transfer all vertex groups from selected to active mesh"},
        {0, NULL, 0, NULL, NULL}
 };
 
 static EnumPropertyItem WT_method_item[] = {
-       {WT_BY_INDEX, "WT_BY_INDEX", 1, "Vertex index", "Copy for identical meshes."},
-       {WT_BY_NEAREST_VERTEX, "WT_BY_NEAREST_VERTEX", 1, "Nearest vertex", "Copy weight from closest vertex."},
-       {WT_BY_NEAREST_FACE, "WT_BY_NEAREST_FACE", 1, "Nearest face", "Barycentric interpolation from nearest face."},
-       {WT_BY_NEAREST_VERTEX_IN_FACE, "WT_BY_NEAREST_VERTEX_IN_FACE", 1, "Nearest vertex in face", "Copy weight from closest vertex in nearest face."},
+       {WT_BY_INDEX, "WT_BY_INDEX", 1, "Vertex index", "Copy for identical meshes"},
+       {WT_BY_NEAREST_VERTEX, "WT_BY_NEAREST_VERTEX", 1, "Nearest vertex", "Copy weight from closest vertex"},
+       {WT_BY_NEAREST_FACE, "WT_BY_NEAREST_FACE", 1, "Nearest face", "Barycentric interpolation from nearest face"},
+       {WT_BY_NEAREST_VERTEX_IN_FACE, "WT_BY_NEAREST_VERTEX_IN_FACE", 1, "Nearest vertex in face", "Copy weight from closest vertex in nearest face"},
        {0, NULL, 0, NULL, NULL}
 };
 
 static EnumPropertyItem WT_replace_mode_item[] = {
-       {WT_REPLACE_ALL_WEIGHTS, "WT_REPLACE_ALL_WEIGHTS", 1, "All", "Overwrites all weights."},
-       {WT_REPLACE_EMPTY_WEIGHTS, "WT_REPLACE_EMPTY_WEIGHTS", 1, "Empty", "Adds weights to vertices with no weight."},
+       {WT_REPLACE_ALL_WEIGHTS, "WT_REPLACE_ALL_WEIGHTS", 1, "All", "Overwrite all weights"},
+       {WT_REPLACE_EMPTY_WEIGHTS, "WT_REPLACE_EMPTY_WEIGHTS", 1, "Empty", "Add weights to vertices with no weight"},
        {0, NULL, 0, NULL, NULL}
 };
 
@@ -3140,7 +3140,7 @@ void OBJECT_OT_vertex_group_limit_total(wmOperatorType *ot)
        /* identifiers */
        ot->name = "Limit Number of Weights per Vertex";
        ot->idname = "OBJECT_OT_vertex_group_limit_total";
-       ot->description = "Limits deform weights associated with a vertex to a specified number by removing lowest weights";
+       ot->description = "Limit deform weights associated with a vertex to a specified number by removing lowest weights";
 
        /* api callbacks */
        ot->poll = vertex_group_poll;
index 21717cd..4e16e50 100644 (file)
@@ -2695,7 +2695,7 @@ void VIEW3D_OT_render_border(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name = "Set Render Border";
-       ot->description = "Set the boundaries of the border render and enables border render";
+       ot->description = "Set the boundaries of the border render and enable border render";
        ot->idname = "VIEW3D_OT_render_border";
 
        /* api callbacks */
@@ -2715,7 +2715,7 @@ void VIEW3D_OT_render_border(wmOperatorType *ot)
        RNA_def_boolean(ot->srna, "camera_only", 0, "Camera Only", "Set render border for camera view and final render only");
 }
 
-/* ********************* Set render border operator ****************** */
+/* ********************* Clear render border operator ****************** */
 
 static int clear_render_border_exec(bContext *C, wmOperator *UNUSED(op))
 {
@@ -2751,7 +2751,7 @@ void VIEW3D_OT_clear_render_border(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name = "Clear Render Border";
-       ot->description = "Clear the boundaries of the border render and enables border render";
+       ot->description = "Clear the boundaries of the border render and disable border render";
        ot->idname = "VIEW3D_OT_clear_render_border";
 
        /* api callbacks */
index 3ff6338..11ce734 100644 (file)
@@ -243,8 +243,8 @@ StructRNA *rna_PropertyGroup_register(Main *UNUSED(bmain), ReportList *reports,
         * owns the string pointer which it could potentially free while blender
         * is running. */
        if (BLI_strnlen(identifier, MAX_IDPROP_NAME) == MAX_IDPROP_NAME) {
-               BKE_reportf(reports, RPT_ERROR, "registering id property class: '%s' is too long, maximum length is "
-                           STRINGIFY(MAX_IDPROP_NAME), identifier);
+               BKE_reportf(reports, RPT_ERROR, "Registering id property class: '%s' is too long, maximum length is %d",
+                           identifier, MAX_IDPROP_NAME);
                return NULL;
        }
 
@@ -287,7 +287,7 @@ static void rna_ID_update_tag(ID *id, ReportList *reports, int flag)
                switch (GS(id->name)) {
                        case ID_OB:
                                if (flag & ~(OB_RECALC_ALL)) {
-                                       BKE_report(reports, RPT_ERROR, "'refresh' incompatible with Object ID type");
+                                       BKE_report(reports, RPT_ERROR, "'Refresh' incompatible with Object ID type");
                                        return;
                                }
                                break;
@@ -295,7 +295,7 @@ static void rna_ID_update_tag(ID *id, ReportList *reports, int flag)
 #if 0
                        case ID_PA:
                                if (flag & ~(OB_RECALC_ALL | PSYS_RECALC)) {
-                                       BKE_report(reports, RPT_ERROR, "'refresh' incompatible with ParticleSettings ID type");
+                                       BKE_report(reports, RPT_ERROR, "'Refresh' incompatible with ParticleSettings ID type");
                                        return;
                                }
                                break;
index f08b908..d3029fc 100644 (file)
@@ -74,7 +74,7 @@ static void rna_Action_groups_remove(bAction *act, ReportList *reports, bActionG
        
        /* try to remove the F-Curve from the action */
        if (!BLI_remlink_safe(&act->groups, agrp)) {
-               BKE_reportf(reports, RPT_ERROR, "ActionGroup '%s' not found in action '%s'", agrp->name, act->id.name + 2);
+               BKE_reportf(reports, RPT_ERROR, "Action group '%s' not found in action '%s'", agrp->name, act->id.name + 2);
                return;
        }
 
@@ -116,7 +116,7 @@ static void rna_Action_fcurve_remove(bAction *act, ReportList *reports, FCurve *
 {
        if (fcu->grp) {
                if (BLI_findindex(&act->groups, fcu->grp) == -1) {
-                       BKE_reportf(reports, RPT_ERROR, "F-Curve's ActionGroup '%s' not found in action '%s'",
+                       BKE_reportf(reports, RPT_ERROR, "F-Curve's action group '%s' not found in action '%s'",
                                    fcu->grp->name, act->id.name + 2);
                        return;
                }
@@ -148,7 +148,7 @@ static TimeMarker *rna_Action_pose_markers_new(bAction *act, const char name[])
 static void rna_Action_pose_markers_remove(bAction *act, ReportList *reports, TimeMarker *marker)
 {
        if (!BLI_remlink_safe(&act->markers, marker)) {
-               BKE_reportf(reports, RPT_ERROR, "TimelineMarker '%s' not found in Action '%s'", marker->name, act->id.name + 2);
+               BKE_reportf(reports, RPT_ERROR, "Timeline marker '%s' not found in action '%s'", marker->name, act->id.name + 2);
                return;
        }
 
@@ -256,15 +256,15 @@ static void rna_def_dopesheet(BlenderRNA *brna)
 
        srna = RNA_def_struct(brna, "DopeSheet", NULL);
        RNA_def_struct_sdna(srna, "bDopeSheet");
-       RNA_def_struct_ui_text(srna, "DopeSheet", "Settings for filtering the channels shown in Animation Editors");
+       RNA_def_struct_ui_text(srna, "DopeSheet", "Settings for filtering the channels shown in animation editors");
        
        /* Source of DopeSheet data */
        /* XXX: make this obsolete? */
        prop = RNA_def_property(srna, "source", PROP_POINTER, PROP_NONE);
        RNA_def_property_struct_type(prop, "ID");
        RNA_def_property_ui_text(prop, "Source",
-                                "ID-Block representing source data, currently ID_SCE (for Dopesheet), "
-                                "and ID_SC (for Grease Pencil)");
+                                "ID block representing source data, currently ID_SCE (for dopesheet), "
+                                "and ID_SC (for grease pencil)");
        
        /* Show datablock filters */
        prop = RNA_def_property(srna, "show_datablock_filters", PROP_BOOLEAN, PROP_NONE);
@@ -283,29 +283,29 @@ static void rna_def_dopesheet(BlenderRNA *brna)
        
        prop = RNA_def_property(srna, "show_hidden", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_INCL_HIDDEN);
-       RNA_def_property_ui_text(prop, "Display Hidden", "Include channels from objects/bone that aren't visible");
+       RNA_def_property_ui_text(prop, "Display Hidden", "Include channels from objects/bone that are not visible");
        RNA_def_property_ui_icon(prop, ICON_GHOST_ENABLED, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        /* Debug Filtering Settings */
        prop = RNA_def_property(srna, "show_only_errors", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLY_ERRORS);
-       RNA_def_property_ui_text(prop, "Show Errors", "Only include F-Curves and Drivers that are disabled or have errors");
-       RNA_def_property_ui_icon(prop, ICON_HELP, 0); // XXX: this doesn't quite fit?
+       RNA_def_property_ui_text(prop, "Show Errors", "Only include F-Curves and drivers that are disabled or have errors");
+       RNA_def_property_ui_icon(prop, ICON_HELP, 0); /* XXX: this doesn't quite fit */
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        /* Object Group Filtering Settings */
        prop = RNA_def_property(srna, "show_only_group_objects", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_ONLYOBGROUP);
        RNA_def_property_ui_text(prop, "Only Objects in Group",
-                                "Only include channels from Objects in the specified Group");
+                                "Only include channels from objects in the specified group");
        RNA_def_property_ui_icon(prop, ICON_GROUP, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "filter_group", PROP_POINTER, PROP_NONE);
        RNA_def_property_pointer_sdna(prop, NULL, "filter_grp");
        RNA_def_property_flag(prop, PROP_EDITABLE);
-       RNA_def_property_ui_text(prop, "Filtering Group", "Group that included Object should be a member of");
+       RNA_def_property_ui_text(prop, "Filtering Group", "Group that included object should be a member of");
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        /* FCurve Display Name Search Settings */
@@ -325,21 +325,21 @@ static void rna_def_dopesheet(BlenderRNA *brna)
        prop = RNA_def_property(srna, "show_missing_nla", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NLA_NOACT);
        RNA_def_property_ui_text(prop, "Include Missing NLA",
-                                "Include Animation Data blocks with no NLA data (NLA Editor only)");
+                                "Include animation data blocks with no NLA data (NLA editor only)");
        RNA_def_property_ui_icon(prop, ICON_ACTION, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        /* Summary Settings (DopeSheet editors only) */
        prop = RNA_def_property(srna, "show_summary", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_SUMMARY);
-       RNA_def_property_ui_text(prop, "Display Summary", "Display an additional 'summary' line (DopeSheet Editors only)");
+       RNA_def_property_ui_text(prop, "Display Summary", "Display an additional 'summary' line (DopeSheet editors only)");
        RNA_def_property_ui_icon(prop, ICON_BORDERMOVE, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_expanded_summary", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", ADS_FLAG_SUMMARY_COLLAPSED);
        RNA_def_property_ui_text(prop, "Collapse Summary",
-                                "Collapse summary when shown, so all other channels get hidden (DopeSheet Editors Only)");
+                                "Collapse summary when shown, so all other channels get hidden (DopeSheet editors only)");
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        
@@ -347,97 +347,97 @@ static void rna_def_dopesheet(BlenderRNA *brna)
        prop = RNA_def_property(srna, "show_transforms", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOOBJ);
        RNA_def_property_ui_text(prop, "Display Transforms",
-                                "Include visualization of Object-level Animation data (mostly Transforms)");
+                                "Include visualization of object-level animation data (mostly transforms)");
        RNA_def_property_ui_icon(prop, ICON_MANIPUL, 0); /* XXX? */
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_shapekeys", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSHAPEKEYS);
-       RNA_def_property_ui_text(prop, "Display Shapekeys", "Include visualization of ShapeKey related Animation data");
+       RNA_def_property_ui_text(prop, "Display Shapekeys", "Include visualization of shape key related animation data");
        RNA_def_property_ui_icon(prop, ICON_SHAPEKEY_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_meshes", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMESH);
-       RNA_def_property_ui_text(prop, "Display Meshes", "Include visualization of Mesh related Animation data");
+       RNA_def_property_ui_text(prop, "Display Meshes", "Include visualization of mesh related animation data");
        RNA_def_property_ui_icon(prop, ICON_MESH_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_lattices", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOLAT);
-       RNA_def_property_ui_text(prop, "Display Lattices", "Include visualization of Lattice related Animation data");
+       RNA_def_property_ui_text(prop, "Display Lattices", "Include visualization of lattice related animation data");
        RNA_def_property_ui_icon(prop, ICON_LATTICE_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_cameras", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOCAM);
-       RNA_def_property_ui_text(prop, "Display Camera", "Include visualization of Camera related Animation data");
+       RNA_def_property_ui_text(prop, "Display Camera", "Include visualization of camera related animation data");
        RNA_def_property_ui_icon(prop, ICON_CAMERA_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_materials", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMAT);
-       RNA_def_property_ui_text(prop, "Display Material", "Include visualization of Material related Animation data");
+       RNA_def_property_ui_text(prop, "Display Material", "Include visualization of material related animation data");
        RNA_def_property_ui_icon(prop, ICON_MATERIAL_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_lamps", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOLAM);
-       RNA_def_property_ui_text(prop, "Display Lamp", "Include visualization of Lamp related Animation data");
+       RNA_def_property_ui_text(prop, "Display Lamp", "Include visualization of lamp related animation data");
        RNA_def_property_ui_icon(prop, ICON_LAMP_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_textures", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOTEX);
-       RNA_def_property_ui_text(prop, "Display Texture", "Include visualization of Texture related Animation data");
+       RNA_def_property_ui_text(prop, "Display Texture", "Include visualization of texture related animation data");
        RNA_def_property_ui_icon(prop, ICON_TEXTURE_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_curves", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOCUR);
-       RNA_def_property_ui_text(prop, "Display Curve", "Include visualization of Curve related Animation data");
+       RNA_def_property_ui_text(prop, "Display Curve", "Include visualization of curve related animation data");
        RNA_def_property_ui_icon(prop, ICON_CURVE_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_worlds", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOWOR);
-       RNA_def_property_ui_text(prop, "Display World", "Include visualization of World related Animation data");
+       RNA_def_property_ui_text(prop, "Display World", "Include visualization of world related animation data");
        RNA_def_property_ui_icon(prop, ICON_WORLD_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_scenes", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSCE);
-       RNA_def_property_ui_text(prop, "Display Scene", "Include visualization of Scene related Animation data");
+       RNA_def_property_ui_text(prop, "Display Scene", "Include visualization of scene related animation data");
        RNA_def_property_ui_icon(prop, ICON_SCENE_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_particles", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOPART);
-       RNA_def_property_ui_text(prop, "Display Particle", "Include visualization of Particle related Animation data");
+       RNA_def_property_ui_text(prop, "Display Particle", "Include visualization of particle related animation data");
        RNA_def_property_ui_icon(prop, ICON_PARTICLE_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_metaballs", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMBA);
-       RNA_def_property_ui_text(prop, "Display Metaball", "Include visualization of Metaball related Animation data");
+       RNA_def_property_ui_text(prop, "Display Metaball", "Include visualization of metaball related animation data");
        RNA_def_property_ui_icon(prop, ICON_META_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_armatures", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOARM);
-       RNA_def_property_ui_text(prop, "Display Armature", "Include visualization of Armature related Animation data");
+       RNA_def_property_ui_text(prop, "Display Armature", "Include visualization of armature related animation data");
        RNA_def_property_ui_icon(prop, ICON_ARMATURE_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_nodes", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NONTREE);
-       RNA_def_property_ui_text(prop, "Display Node", "Include visualization of Node related Animation data");
+       RNA_def_property_ui_text(prop, "Display Node", "Include visualization of node related animation data");
        RNA_def_property_ui_icon(prop, ICON_NODETREE, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
 
        prop = RNA_def_property(srna, "show_speakers", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSPK);
-       RNA_def_property_ui_text(prop, "Display Speaker", "Include visualization of Speaker related Animation data");
+       RNA_def_property_ui_text(prop, "Display Speaker", "Include visualization of speaker related animation data");
        RNA_def_property_ui_icon(prop, ICON_SPEAKER, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
 }
@@ -474,17 +474,17 @@ static void rna_def_action_group(BlenderRNA *brna)
        
        prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_SELECTED);
-       RNA_def_property_ui_text(prop, "Select", "Action Group is selected");
+       RNA_def_property_ui_text(prop, "Select", "Action group is selected");
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_SELECTED, NULL);
        
        prop = RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_PROTECTED);
-       RNA_def_property_ui_text(prop, "Lock", "Action Group is locked");
+       RNA_def_property_ui_text(prop, "Lock", "Action group is locked");
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_EXPANDED);
-       RNA_def_property_ui_text(prop, "Expanded", "Action Group is expanded");
+       RNA_def_property_ui_text(prop, "Expanded", "Action group is expanded");
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        /* color set */
@@ -583,7 +583,7 @@ static void rna_def_action_pose_markers(BlenderRNA *brna, PropertyRNA *cprop)
        RNA_def_property_flag(prop, PROP_EDITABLE);
        RNA_def_property_pointer_funcs(prop, "rna_Action_active_pose_marker_get",
                                       "rna_Action_active_pose_marker_set", NULL, NULL);
-       RNA_def_property_ui_text(prop, "Active Pose Marker", "Active pose marker for this Action");
+       RNA_def_property_ui_text(prop, "Active Pose Marker", "Active pose marker for this action");
        
        prop = RNA_def_property(srna, "active_index", PROP_INT, PROP_NONE);
        RNA_def_property_int_sdna(prop, NULL, "active_marker");
@@ -606,7 +606,7 @@ static void rna_def_action(BlenderRNA *brna)
        prop = RNA_def_property(srna, "fcurves", PROP_COLLECTION, PROP_NONE);
        RNA_def_property_collection_sdna(prop, NULL, "curves", NULL);
        RNA_def_property_struct_type(prop, "FCurve");
-       RNA_def_property_ui_text(prop, "F-Curves", "The individual F-Curves that make up the Action");
+       RNA_def_property_ui_text(prop, "F-Curves", "The individual F-Curves that make up the action");
        rna_def_action_fcurves(brna, prop);
        
        prop = RNA_def_property(srna, "groups", PROP_COLLECTION, PROP_NONE);
@@ -618,7 +618,7 @@ static void rna_def_action(BlenderRNA *brna)
        prop = RNA_def_property(srna, "pose_markers", PROP_COLLECTION, PROP_NONE);
        RNA_def_property_collection_sdna(prop, NULL, "markers", NULL);
        RNA_def_property_struct_type(prop, "TimelineMarker");
-       RNA_def_property_ui_text(prop, "Pose Markers", "Markers specific to this Action, for labeling poses");
+       RNA_def_property_ui_text(prop, "Pose Markers", "Markers specific to this action, for labeling poses");
        rna_def_action_pose_markers(brna, prop);
        
        /* properties */
@@ -633,8 +633,8 @@ static void rna_def_action(BlenderRNA *brna)
        RNA_def_property_enum_sdna(prop, NULL, "idroot");
        RNA_def_property_enum_items(prop, id_type_items);
        RNA_def_property_ui_text(prop, "ID Root Type",
-                                "Type of ID-block that action can be used on - "
-                                "DO NOT CHANGE UNLESS YOU KNOW WHAT YOU'RE DOING");
+                                "Type of ID block that action can be used on - "
+                                "DO NOT CHANGE UNLESS YOU KNOW WHAT YOU ARE DOING");
        
        /* API calls */
        RNA_api_action(srna);
index d50cb66..a688981 100644 (file)
@@ -369,7 +369,7 @@ static KS_Path *rna_KeyingSet_paths_add(KeyingSet *keyingset, ReportList *report
                keyingset->active_path = BLI_countlist(&keyingset->paths);
        }
        else {
-               BKE_report(reports, RPT_ERROR, "Keying Set Path could not be added");
+               BKE_report(reports, RPT_ERROR, "Keying set path could not be added");
        }
        
        /* return added path */
@@ -388,7 +388,7 @@ static void rna_KeyingSet_paths_remove(KeyingSet *keyingset, ReportList *reports
                keyingset->active_path = 0;
        }
        else {
-               BKE_report(reports, RPT_ERROR, "Keying Set Path could not be removed");
+               BKE_report(reports, RPT_ERROR, "Keying set path could not be removed");
        }
 }
 
@@ -408,7 +408,7 @@ static void rna_KeyingSet_paths_clear(KeyingSet *keyingset, ReportList *reports)
                keyingset->active_path = 0;
        }
        else {
-               BKE_report(reports, RPT_ERROR, "Keying Set Paths could not be removed");
+               BKE_report(reports, RPT_ERROR, "Keying set paths could not be removed");
        }
 }
 
@@ -448,7 +448,7 @@ static FCurve *rna_Driver_from_existing(AnimData *adt, bContext *C, FCurve *src_
 {
        /* verify that we've got a driver to duplicate */
        if (ELEM(NULL, src_driver, src_driver->driver)) {
-               BKE_reportf(CTX_wm_reports(C), RPT_ERROR, "No valid driver data to create copy of");
+               BKE_report(CTX_wm_reports(C), RPT_ERROR, "No valid driver data to create copy of");
                return NULL;
        }
        else {
index b93fd9d..492659f 100644 (file)
@@ -56,11 +56,11 @@ static void rna_KeyingSet_context_refresh(KeyingSet *ks, bContext *C, ReportList
        if (success != 0) {
                switch (success) {
                        case MODIFYKEY_INVALID_CONTEXT:
-                               BKE_report(reports, RPT_ERROR, "Invalid context for Keying Set");
+                               BKE_report(reports, RPT_ERROR, "Invalid context for keying set");
                                break;
                                
                        case MODIFYKEY_MISSING_TYPEINFO:
-                               BKE_report(reports, RPT_ERROR, "Incomplete built-in Keying Set, appears to be missing type info");
+                               BKE_report(reports, RPT_ERROR, "Incomplete built-in keying set, appears to be missing type info");
                                break;
                }
        }
index ad05eff..53b0484 100644 (file)
@@ -62,7 +62,7 @@ EnumPropertyItem keyframe_handle_type_items[] = {
 };
 
 EnumPropertyItem beztriple_interpolation_mode_items[] = {
-       {BEZT_IPO_CONST, "CONSTANT", 0, "Constant", "No interpolation. Value of A gets held until B is encountered"},
+       {BEZT_IPO_CONST, "CONSTANT", 0, "Constant", "No interpolation, value of A gets held until B is encountered"},
        {BEZT_IPO_LIN, "LINEAR", 0, "Linear", "Straight-line interpolation between A and B (i.e. no ease in/out)"},
        {BEZT_IPO_BEZ, "BEZIER", 0, "Bezier", "Smooth interpolation between A and B, with some control over curve shape"},
        {0, NULL, 0, NULL, NULL}
index d8ae579..84cb9f1 100644 (file)
@@ -80,7 +80,7 @@ static void rna_Image_save_render(Image *image, bContext *C, ReportList *reports
                ibuf = BKE_image_acquire_ibuf(image, &iuser, &lock);
 
                if (ibuf == NULL) {
-                       BKE_reportf(reports, RPT_ERROR, "Couldn't acquire buffer from image");
+                       BKE_report(reports, RPT_ERROR, "Could not acquire buffer from image");
                }
                else {
                        ImBuf *write_ibuf;
@@ -92,7 +92,7 @@ static void rna_Image_save_render(Image *image, bContext *C, ReportList *reports
                        write_ibuf->dither = scene->r.dither_intensity;
 
                        if (!BKE_imbuf_write(write_ibuf, path, &scene->r.im_format)) {
-                               BKE_reportf(reports, RPT_ERROR, "Couldn't write image: %s", path);
+                               BKE_reportf(reports, RPT_ERROR, "Could not write image '%s'", path);
                        }
 
                        if (write_ibuf != ibuf)
@@ -102,7 +102,7 @@ static void rna_Image_save_render(Image *image, bContext *C, ReportList *reports
                BKE_image_release_ibuf(image, lock);
        }
        else {
-               BKE_reportf(reports, RPT_ERROR, "Scene not in context, couldn't get save parameters");
+               BKE_report(reports, RPT_ERROR, "Scene not in context, could not get save parameters");
        }
 }
 
@@ -116,7 +116,7 @@ static void rna_Image_save(Image *image, ReportList *reports)
 
                if (image->packedfile) {
                        if (writePackedFile(reports, image->name, image->packedfile, 0) != RET_OK) {
-                               BKE_reportf(reports, RPT_ERROR, "Image \"%s\" could saved packed file to \"%s\"", image->id.name + 2, image->name);
+                               BKE_reportf(reports, RPT_ERROR, "Image '%s' could not save packed file to '%s'", image->id.name + 2, image->name);
                        }
                }
                else if (IMB_saveiff(ibuf, filename, ibuf->flags)) {
@@ -130,11 +130,11 @@ static void rna_Image_save(Image *image, ReportList *reports)
                        ibuf->userflags &= ~IB_BITMAPDIRTY;
                }
                else {
-                       BKE_reportf(reports, RPT_ERROR, "Image \"%s\" could not be saved to \"%s\"", image->id.name + 2, image->name);
+                       BKE_reportf(reports, RPT_ERROR, "Image '%s' could not be saved to '%s'", image->id.name + 2, image->name);
                }
        }
        else {
-               BKE_reportf(reports, RPT_ERROR, "Image \"%s\" does not have any image data", image->id.name + 2);
+               BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2);
        }
 }
 
@@ -143,7 +143,7 @@ static void rna_Image_pack(Image *image, ReportList *reports, int as_png)
        ImBuf *ibuf = BKE_image_get_ibuf(image, NULL);
 
        if (!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
-               BKE_reportf(reports, RPT_ERROR, "Can't pack edited image from disk, only as internal PNG");
+               BKE_reportf(reports, RPT_ERROR, "Cannot pack edited image from disk, only as internal PNG");
        }
        else {
                if (as_png) {
@@ -180,7 +180,7 @@ static void rna_Image_update(Image *image, ReportList *reports)
        ImBuf *ibuf = BKE_image_get_ibuf(image, NULL);
 
        if (ibuf == NULL) {
-               BKE_reportf(reports, RPT_ERROR, "Image \"%s\" does not have any image data", image->id.name + 2);
+               BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2);
                return;
        }
 
@@ -193,7 +193,7 @@ static void rna_Image_update(Image *image, ReportList *reports)
 static void rna_Image_scale(Image *image, ReportList *reports, int width, int height)
 {
        if (!BKE_image_scale(image, width, height)) {
-               BKE_reportf(reports, RPT_ERROR, "Image \"%s\" does not have any image data", image->id.name + 2);
+               BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2);
        }
 }
 
@@ -209,7 +209,7 @@ static int rna_Image_gl_load(Image *image, ReportList *reports, int filter, int
        ibuf = BKE_image_get_ibuf(image, NULL);
 
        if (ibuf == NULL || ibuf->rect == NULL) {
-               BKE_reportf(reports, RPT_ERROR, "Image \"%s\" does not have any image data", image->id.name + 2);
+               BKE_reportf(reports, RPT_ERROR, "Image '%s' does not have any image data", image->id.name + 2);
                return (int)GL_INVALID_OPERATION;
        }
 
index a2fbada..20e9d13 100644 (file)
@@ -1826,7 +1826,7 @@ void RNA_def_material(BlenderRNA *brna)
 
     prop= RNA_def_property(srna, "use_light_group_local", PROP_BOOLEAN, PROP_NONE);
     RNA_def_property_boolean_sdna(prop, NULL, "shade_flag", MA_GROUP_LOCAL);
-    RNA_def_property_ui_text(prop, "Light Group Local", "When linked in, Material uses local light group with the same name");
+    RNA_def_property_ui_text(prop, "Light Group Local", "When linked in, material uses local light group with the same name");
     RNA_def_property_update(prop, 0, "rna_Material_update");
 
        prop = RNA_def_property(srna, "use_raytrace", PROP_BOOLEAN, PROP_NONE);
index 0b8afef..0c1ec0b 100644 (file)
@@ -506,7 +506,7 @@ static void rna_Object_dup_group_set(PointerRNA *ptr, PointerRNA value)
                ob->dup_group = grp;
        else
                BKE_report(NULL, RPT_ERROR,
-                          "Cannot set dupli-group as object belongs in group being instanced thus causing a cycle");
+                          "Cannot set dupli-group as object belongs in group being instanced, thus causing a cycle");
 }
 
 static void rna_VertexGroup_name_set(PointerRNA *ptr, const char *value)
@@ -1284,7 +1284,7 @@ static void rna_VertexGroup_vertex_add(ID *id, bDeformGroup *def, ReportList *re
        Object *ob = (Object *)id;
 
        if (ED_vgroup_object_is_edit_mode(ob)) {
-               BKE_reportf(reports, RPT_ERROR, "VertexGroup.add(): Can't be called while object is in edit mode");
+               BKE_report(reports, RPT_ERROR, "VertexGroup.add(): cannot be called while object is in edit mode");
                return;
        }
 
@@ -1299,7 +1299,7 @@ static void rna_VertexGroup_vertex_remove(ID *id, bDeformGroup *dg, ReportList *
        Object *ob = (Object *)id;
 
        if (ED_vgroup_object_is_edit_mode(ob)) {
-               BKE_reportf(reports, RPT_ERROR, "VertexGroup.remove(): Can't be called while object is in edit mode");
+               BKE_report(reports, RPT_ERROR, "VertexGroup.remove(): cannot be called while object is in edit mode");
                return;
        }
 
@@ -1314,7 +1314,7 @@ static float rna_VertexGroup_weight(ID *id, bDeformGroup *dg, ReportList *report
        float weight = ED_vgroup_vert_weight((Object *)id, dg, index);
 
        if (weight < 0) {
-               BKE_reportf(reports, RPT_ERROR, "Vertex not in group");
+               BKE_report(reports, RPT_ERROR, "Vertex not in group");
        }
        return weight;
 }
index faad240..bdcda79 100644 (file)
@@ -368,7 +368,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
        prop = RNA_def_property(srna, "burning_rate", PROP_FLOAT, PROP_NONE);
        RNA_def_property_range(prop, 0.01, 4.0);
        RNA_def_property_ui_range(prop, 0.01, 2.0, 1.0, 5);
-       RNA_def_property_ui_text(prop, "Speed", "Speed of the burning reaction. Use larger values for smaller flame");
+       RNA_def_property_ui_text(prop, "Speed", "Speed of the burning reaction (use larger values for smaller flame)");
        RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache");
 
        prop = RNA_def_property(srna, "flame_smoke", PROP_FLOAT, PROP_NONE);
@@ -423,7 +423,8 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
        prop = RNA_def_property(srna, "adapt_threshold", PROP_FLOAT, PROP_NONE);
        RNA_def_property_range(prop, 0.01, 0.5);
        RNA_def_property_ui_range(prop, 0.01, 0.5, 1.0, 5);
-       RNA_def_property_ui_text(prop, "Threshold", "Maximum amount of fluid cell can contain before it's considered empty");
+       RNA_def_property_ui_text(prop, "Threshold",
+                                "Maximum amount of fluid cell can contain before it is considered empty");
        RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache");
 }
 
@@ -550,7 +551,7 @@ static void rna_def_smoke_flow_settings(BlenderRNA *brna)
                                      "rna_SmokeFlow_density_vgroup_length",
                                      "rna_SmokeFlow_density_vgroup_set");
        RNA_def_property_ui_text(prop, "Vertex Group",
-                                "Name of Vertex Group which determines surface emission rate");
+                                "Name of vertex group which determines surface emission rate");
        RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset");
 
        prop = RNA_def_property(srna, "use_texture", PROP_BOOLEAN, PROP_NONE);
index 51fb9d4..3082d86 100644 (file)
@@ -961,7 +961,7 @@ static BGpic *rna_BackgroundImage_new(View3D *v3d)
 static void rna_BackgroundImage_remove(View3D *v3d, ReportList *reports, BGpic *bgpic)
 {
        if (BLI_findindex(&v3d->bgpicbase, bgpic) == -1) {
-               BKE_report(reports, RPT_ERROR, "BackgroundImage can't be removed");
+               BKE_report(reports, RPT_ERROR, "Background image cannot be removed");
        }
        else {
                ED_view3D_background_image_remove(v3d, bgpic);
@@ -1509,7 +1509,7 @@ static void rna_def_space_view3d(BlenderRNA *brna)
        RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_RENDER_BORDER);
        RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
        RNA_def_property_ui_text(prop, "Render Border",
-                                "use a user-defined border region within the frame size for rendered viewport");
+                                "Use a user-defined border region within the frame size for rendered viewport");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 
        prop = RNA_def_property(srna, "render_border_min_x", PROP_FLOAT, PROP_NONE);
index 7bfa7cc..a0a9f61 100644 (file)
@@ -192,7 +192,7 @@ static StructRNA *rna_Panel_register(Main *bmain, ReportList *reports, void *dat
                return NULL;
                
        if (strlen(identifier) >= sizeof(dummypt.idname)) {
-               BKE_reportf(reports, RPT_ERROR, "registering panel class: '%s' is too long, maximum length is %d",
+               BKE_reportf(reports, RPT_ERROR, "Registering panel class: '%s' is too long, maximum length is %d",
                            identifier, (int)sizeof(dummypt.idname));
                return NULL;
        }
@@ -309,7 +309,7 @@ static StructRNA *rna_Header_register(Main *bmain, ReportList *reports, void *da
                return NULL;
 
        if (strlen(identifier) >= sizeof(dummyht.idname)) {
-               BKE_reportf(reports, RPT_ERROR, "registering header class: '%s' is too long, maximum length is %d",
+               BKE_reportf(reports, RPT_ERROR, "Registering header class: '%s' is too long, maximum length is %d",
                            identifier, (int)sizeof(dummyht.idname));
                return NULL;
        }
@@ -438,7 +438,7 @@ static StructRNA *rna_Menu_register(Main *bmain, ReportList *reports, void *data
                return NULL;
        
        if (strlen(identifier) >= sizeof(dummymt.idname)) {
-               BKE_reportf(reports, RPT_ERROR, "registering menu class: '%s' is too long, maximum length is %d",
+               BKE_reportf(reports, RPT_ERROR, "Registering menu class: '%s' is too long, maximum length is %d",
                            identifier, (int)sizeof(dummymt.idname));
                return NULL;
        }
index 614029e..64992ed 100644 (file)
@@ -2749,7 +2749,7 @@ static void rna_def_userdef_edit(BlenderRNA *brna)
        prop = RNA_def_property(srna, "use_auto_keying_warning", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_NOWARNING);
        RNA_def_property_ui_text(prop, "Show Auto Keying Warning",
-                                "Show warning indicators when transforming Object and Bones if Auto Keying is enabled");
+                                "Show warning indicators when transforming objects and bones if auto keying is enabled");
        
        /* keyframing settings */
        prop = RNA_def_property(srna, "use_keyframe_insert_needed", PROP_BOOLEAN, PROP_NONE);
index 28b034f..8bacd4c 100644 (file)
@@ -1201,7 +1201,7 @@ static StructRNA *rna_MacroOperator_register(Main *bmain, ReportList *reports, v
        }
 
        if (strlen(identifier) >= sizeof(dummyop.idname)) {
-               BKE_reportf(reports, RPT_ERROR, "registering operator class: '%s' is too long, maximum length is %d",
+               BKE_reportf(reports, RPT_ERROR, "Registering operator class: '%s' is too long, maximum length is %d",
                            identifier, (int)sizeof(dummyop.idname));
                return NULL;
        }
index de78224..fefb383 100644 (file)
@@ -95,7 +95,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
                return dm;
        }
        else if (dm->getNumPolys(dm) <= 3) {
-               modifier_setError(md, "%s", TIP_("Modifier requires more than 3 input faces."));
+               modifier_setError(md, "%s", TIP_("Modifier requires more than 3 input faces"));
                return dm;
        }
 
@@ -146,7 +146,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
        }
 
        if (numTris < 3) {
-               modifier_setError(md, "%s", TIP_("Modifier requires more than 3 input faces (triangles)."));
+               modifier_setError(md, "%s", TIP_("Modifier requires more than 3 input faces (triangles)"));
                dm = CDDM_copy(dm);
                return dm;
        }
@@ -221,12 +221,12 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
                        CDDM_calc_edges_tessface(result);
                }
                else
-                       modifier_setError(md, "%s", TIP_("Out of memory."));
+                       modifier_setError(md, "%s", TIP_("Out of memory"));
 
                LOD_FreeDecimationData(&lod);
        }
        else
-               modifier_setError(md, "%s", TIP_("Non-manifold mesh as input."));
+               modifier_setError(md, "%s", TIP_("Non-manifold mesh as input"));
 
        MEM_freeN(lod.vertex_buffer);
        MEM_freeN(lod.vertex_normal_buffer);
index fdaf366..a3fb953 100644 (file)
@@ -1872,7 +1872,7 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
                if (scene->r.border.xmax <= scene->r.border.xmin ||
                    scene->r.border.ymax <= scene->r.border.ymin)
                {
-                       BKE_report(reports, RPT_ERROR, "No border area selected.");
+                       BKE_report(reports, RPT_ERROR, "No border area selected");
                        return 0;
                }
        }
@@ -1883,13 +1883,13 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
                render_result_exr_file_path(scene, "", 0, str);
                
                if (BLI_file_is_writable(str) == 0) {
-                       BKE_report(reports, RPT_ERROR, "Can not save render buffers, check the temp default path");
+                       BKE_report(reports, RPT_ERROR, "Cannot save render buffers, check the temp default path");
                        return 0;
                }
                
                /* no fullsample and edge */
                if ((scene->r.scemode & R_FULL_SAMPLE) && (scene->r.mode & R_EDGE)) {
-                       BKE_report(reports, RPT_ERROR, "Full Sample doesn't support Edge Enhance");
+                       BKE_report(reports, RPT_ERROR, "Full sample does not support edge enhance");
                        return 0;
                }
                
@@ -1900,18 +1900,18 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
        if (scene->r.scemode & R_DOCOMP) {
                if (scene->use_nodes) {
                        if (!scene->nodetree) {
-                               BKE_report(reports, RPT_ERROR, "No node tree in Scene");
+                               BKE_report(reports, RPT_ERROR, "No node tree in scene");
                                return 0;
                        }
                        
                        if (!check_composite_output(scene)) {
-                               BKE_report(reports, RPT_ERROR, "No Render Output Node in Scene");
+                               BKE_report(reports, RPT_ERROR, "No render output node in scene");
                                return 0;
                        }
                        
                        if (scene->r.scemode & R_FULL_SAMPLE) {
                                if (composite_needs_render(scene, 0) == 0) {
-                                       BKE_report(reports, RPT_ERROR, "Full Sample AA not supported without 3d rendering");
+                                       BKE_report(reports, RPT_ERROR, "Full sample AA not supported without 3D rendering");
                                        return 0;
                                }
                        }
@@ -1930,7 +1930,7 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
        /* forbidden combinations */
        if (scene->r.mode & R_PANORAMA) {
                if (scene->r.mode & R_ORTHO) {
-                       BKE_report(reports, RPT_ERROR, "No Ortho render possible for Panorama");
+                       BKE_report(reports, RPT_ERROR, "No ortho render possible for panorama");
                        return 0;
                }
        }
@@ -1946,7 +1946,7 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
                if (!(srl->layflag & SCE_LAY_DISABLE))
                        break;
        if (srl == NULL) {
-               BKE_report(reports, RPT_ERROR, "All RenderLayers are disabled");
+               BKE_report(reports, RPT_ERROR, "All render layers are disabled");
                return 0;
        }
 
@@ -2460,25 +2460,25 @@ void RE_layer_load_from_file(RenderLayer *layer, ReportList *reports, const char
                                        IMB_freeImBuf(ibuf_clip);
                                }
                                else {
-                                       BKE_reportf(reports, RPT_ERROR, "RE_result_rect_from_file: failed to allocate clip buffer '%s'\n", filename);
+                                       BKE_reportf(reports, RPT_ERROR, "RE_result_rect_from_file: failed to allocate clip buffer '%s'", filename);
                                }
                        }
                        else {
-                               BKE_reportf(reports, RPT_ERROR, "RE_result_rect_from_file: incorrect dimensions for partial copy '%s'\n", filename);
+                               BKE_reportf(reports, RPT_ERROR, "RE_result_rect_from_file: incorrect dimensions for partial copy '%s'", filename);
                        }
                }
 
                IMB_freeImBuf(ibuf);
        }
        else {
-               BKE_reportf(reports, RPT_ERROR, "RE_result_rect_from_file: failed to load '%s'\n", filename);
+               BKE_reportf(reports, RPT_ERROR, "RE_result_rect_from_file: failed to load '%s'", filename);
        }
 }
 
 void RE_result_load_from_file(RenderResult *result, ReportList *reports, const char *filename)
 {
        if (!render_result_exr_file_read_path(result, NULL, filename)) {
-               BKE_reportf(reports, RPT_ERROR, "RE_result_rect_from_file: failed to load '%s'\n", filename);
+               BKE_reportf(reports, RPT_ERROR, "RE_result_rect_from_file: failed to load '%s'", filename);
                return;
        }
 }
@@ -2539,7 +2539,7 @@ int RE_WriteEnvmapResult(struct ReportList *reports, Scene *scene, EnvMap *env,
                return TRUE;
        }
        else {
-               BKE_report(reports, RPT_ERROR, "Error writing environment map.");
+               BKE_report(reports, RPT_ERROR, "Error writing environment map");
                return FALSE;
        }
 }
index 0bac26e..f828158 100644 (file)
@@ -786,7 +786,7 @@ int RE_WriteRenderResult(ReportList *reports, RenderResult *rr, const char *file
        }
        else {
                /* TODO, get the error from openexr's exception */
-               BKE_report(reports, RPT_ERROR, "Error Writing Render Result, see console");
+               BKE_report(reports, RPT_ERROR, "Error writing render result (see console)");
                success = FALSE;
        }
        IMB_exr_close(exrhandle);