forked from bartvdbraak/blender
More UI messages and BKE_reportf<->BKE_report fixes...
This commit is contained in:
parent
d3eb9dddd6
commit
b8267a0dfb
@ -161,7 +161,7 @@ dict_uimsgs = {
|
||||
"unreacted",
|
||||
"unregister",
|
||||
"unselected",
|
||||
"unsubdivided",
|
||||
"unsubdivided", "unsubdivide",
|
||||
"unshadowed",
|
||||
"unspill",
|
||||
"unstitchable",
|
||||
@ -189,6 +189,7 @@ dict_uimsgs = {
|
||||
"selectability",
|
||||
"slurph",
|
||||
"stitchable",
|
||||
"symmetrize",
|
||||
"trackability",
|
||||
"transmissivity",
|
||||
"rasterized", "rasterization",
|
||||
@ -417,6 +418,7 @@ dict_uimsgs = {
|
||||
"dpi",
|
||||
"dvar",
|
||||
"dx",
|
||||
"eo",
|
||||
"fh",
|
||||
"fov",
|
||||
"fft",
|
||||
|
@ -147,7 +147,7 @@ short ANIM_add_driver(ReportList *reports, ID *id, const char rna_path[], int ar
|
||||
RNA_id_pointer_create(id, &id_ptr);
|
||||
if ((RNA_path_resolve(&id_ptr, rna_path, &ptr, &prop) == 0) || (prop == NULL)) {
|
||||
BKE_reportf(reports, RPT_ERROR,
|
||||
"Could not add Driver, as RNA Path is invalid for the given ID (ID = %s, Path = %s)",
|
||||
"Could not add driver, as RNA path is invalid for the given ID (ID = %s, path = %s)",
|
||||
id->name, rna_path);
|
||||
return 0;
|
||||
}
|
||||
@ -310,7 +310,7 @@ short ANIM_copy_driver(ReportList *reports, ID *id, const char rna_path[], int a
|
||||
RNA_id_pointer_create(id, &id_ptr);
|
||||
if ((RNA_path_resolve(&id_ptr, rna_path, &ptr, &prop) == 0) || (prop == NULL)) {
|
||||
BKE_reportf(reports, RPT_ERROR,
|
||||
"Could not find Driver to copy, as RNA Path is invalid for the given ID (ID = %s, Path = %s)",
|
||||
"Could not find driver to copy, as RNA path is invalid for the given ID (ID = %s, path = %s)",
|
||||
id->name, rna_path);
|
||||
return 0;
|
||||
}
|
||||
@ -357,14 +357,14 @@ short ANIM_paste_driver(ReportList *reports, ID *id, const char rna_path[], int
|
||||
RNA_id_pointer_create(id, &id_ptr);
|
||||
if ((RNA_path_resolve(&id_ptr, rna_path, &ptr, &prop) == 0) || (prop == NULL)) {
|
||||
BKE_reportf(reports, RPT_ERROR,
|
||||
"Could not paste Driver, as RNA Path is invalid for the given ID (ID = %s, Path = %s)",
|
||||
"Could not paste driver, as RNA path is invalid for the given ID (ID = %s, path = %s)",
|
||||
id->name, rna_path);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* if the buffer is empty, cannot paste... */
|
||||
if (channeldriver_copypaste_buf == NULL) {
|
||||
BKE_report(reports, RPT_ERROR, "Paste Driver: No Driver to paste");
|
||||
BKE_report(reports, RPT_ERROR, "Paste driver: no driver to paste");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -43,6 +43,8 @@
|
||||
#include "BLI_dynstr.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "DNA_anim_types.h"
|
||||
#include "DNA_armature_types.h"
|
||||
#include "DNA_constraint_types.h"
|
||||
@ -787,14 +789,15 @@ short insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *p
|
||||
/* F-Curve not editable? */
|
||||
if (fcurve_is_keyframable(fcu) == 0) {
|
||||
BKE_reportf(reports, RPT_ERROR,
|
||||
"F-Curve with path = '%s' [%d] cannot be keyframed. Ensure that it is not locked or sampled. Also, try removing F-Modifiers",
|
||||
"F-Curve with path = '%s' [%d] cannot be keyframed, ensure that it is not locked or sampled, "
|
||||
"and try removing F-Modifiers",
|
||||
fcu->rna_path, fcu->array_index);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* if no property given yet, try to validate from F-Curve info */
|
||||
if ((ptr.id.data == NULL) && (ptr.data == NULL)) {
|
||||
BKE_report(reports, RPT_ERROR, "No RNA-pointer available to retrieve values for keyframing from");
|
||||
BKE_report(reports, RPT_ERROR, "No RNA pointer available to retrieve values for keyframing from");
|
||||
return 0;
|
||||
}
|
||||
if (prop == NULL) {
|
||||
@ -803,10 +806,10 @@ short insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *p
|
||||
/* try to get property we should be affecting */
|
||||
if ((RNA_path_resolve(&ptr, fcu->rna_path, &tmp_ptr, &prop) == 0) || (prop == NULL)) {
|
||||
/* property not found... */
|
||||
const char *idname = (ptr.id.data) ? ((ID *)ptr.id.data)->name : "<No ID-Pointer>";
|
||||
const char *idname = (ptr.id.data) ? ((ID *)ptr.id.data)->name : TIP_("<No ID pointer>");
|
||||
|
||||
BKE_reportf(reports, RPT_ERROR,
|
||||
"Could not insert keyframe, as RNA Path is invalid for the given ID (ID = %s, Path = %s)",
|
||||
"Could not insert keyframe, as RNA path is invalid for the given ID (ID = %s, path = %s)",
|
||||
idname, fcu->rna_path);
|
||||
return 0;
|
||||
}
|
||||
@ -906,15 +909,15 @@ short insert_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
|
||||
|
||||
/* validate pointer first - exit if failure */
|
||||
if (id == NULL) {
|
||||
BKE_reportf(reports, RPT_ERROR, "No ID-block to insert keyframe in (Path = %s)", rna_path);
|
||||
BKE_reportf(reports, RPT_ERROR, "No ID block to insert keyframe in (path = %s)", rna_path);
|
||||
return 0;
|
||||
}
|
||||
|
||||
RNA_id_pointer_create(id, &id_ptr);
|
||||
if ((RNA_path_resolve(&id_ptr, rna_path, &ptr, &prop) == 0) || (prop == NULL)) {
|
||||
BKE_reportf(reports, RPT_ERROR,
|
||||
"Could not insert keyframe, as RNA Path is invalid for the given ID (ID = %s, Path = %s)",
|
||||
(id) ? id->name : "<Missing ID-Block>", rna_path);
|
||||
"Could not insert keyframe, as RNA path is invalid for the given ID (ID = %s, path = %s)",
|
||||
(id) ? id->name : TIP_("<Missing ID block>"), rna_path);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -927,7 +930,7 @@ short insert_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
|
||||
|
||||
if (act == NULL) {
|
||||
BKE_reportf(reports, RPT_ERROR,
|
||||
"Could not insert keyframe, as this type does not support animation data (ID = %s, Path = %s)",
|
||||
"Could not insert keyframe, as this type does not support animation data (ID = %s, path = %s)",
|
||||
id->name, rna_path);
|
||||
return 0;
|
||||
}
|
||||
@ -997,14 +1000,16 @@ short delete_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
|
||||
|
||||
/* sanity checks */
|
||||
if (ELEM(NULL, id, adt)) {
|
||||
BKE_report(reports, RPT_ERROR, "No ID-Block and/Or AnimData to delete keyframe from");
|
||||
BKE_report(reports, RPT_ERROR, "No ID block and/or AnimData to delete keyframe from");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* validate pointer first - exit if failure */
|
||||
RNA_id_pointer_create(id, &id_ptr);
|
||||
if ((RNA_path_resolve(&id_ptr, rna_path, &ptr, &prop) == 0) || (prop == NULL)) {
|
||||
BKE_reportf(reports, RPT_ERROR, "Could not delete keyframe, as RNA Path is invalid for the given ID (ID = %s, Path = %s)", id->name, rna_path);
|
||||
BKE_reportf(reports, RPT_ERROR,
|
||||
"Could not delete keyframe, as RNA path is invalid for the given ID (ID = %s, path = %s)",
|
||||
id->name, rna_path);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1023,7 +1028,7 @@ short delete_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
|
||||
cfra = BKE_nla_tweakedit_remap(adt, cfra, NLATIME_CONVERT_UNMAP);
|
||||
}
|
||||
else {
|
||||
BKE_reportf(reports, RPT_ERROR, "No Action to delete keyframes from for ID = %s\n", id->name);
|
||||
BKE_reportf(reports, RPT_ERROR, "No action to delete keyframes from for ID = %s\n", id->name);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@ -1096,14 +1101,16 @@ static short clear_keyframe(ReportList *reports, ID *id, bAction *act, const cha
|
||||
|
||||
/* sanity checks */
|
||||
if (ELEM(NULL, id, adt)) {
|
||||
BKE_report(reports, RPT_ERROR, "No ID-Block and/Or AnimData to delete keyframe from");
|
||||
BKE_report(reports, RPT_ERROR, "No ID block and/or AnimData to delete keyframe from");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* validate pointer first - exit if failure */
|
||||
RNA_id_pointer_create(id, &id_ptr);
|
||||
if ((RNA_path_resolve(&id_ptr, rna_path, &ptr, &prop) == 0) || (prop == NULL)) {
|
||||
BKE_reportf(reports, RPT_ERROR, "Could not clear keyframe, as RNA Path is invalid for the given ID (ID = %s, Path = %s)", id->name, rna_path);
|
||||
BKE_reportf(reports, RPT_ERROR,
|
||||
"Could not clear keyframe, as RNA path is invalid for the given ID (ID = %s, path = %s)",
|
||||
id->name, rna_path);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1119,7 +1126,7 @@ static short clear_keyframe(ReportList *reports, ID *id, bAction *act, const cha
|
||||
act = adt->action;
|
||||
}
|
||||
else {
|
||||
BKE_reportf(reports, RPT_ERROR, "No Action to delete keyframes from for ID = %s\n", id->name);
|
||||
BKE_reportf(reports, RPT_ERROR, "No action to delete keyframes from for ID = %s\n", id->name);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@ -1222,30 +1229,30 @@ static int insert_key_exec(bContext *C, wmOperator *op)
|
||||
|
||||
/* report failures */
|
||||
if (ks == NULL) {
|
||||
BKE_report(op->reports, RPT_ERROR, "No active Keying Set");
|
||||
BKE_report(op->reports, RPT_ERROR, "No active keying set");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
/* try to insert keyframes for the channels specified by KeyingSet */
|
||||
success = ANIM_apply_keyingset(C, NULL, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
|
||||
if (G.debug & G_DEBUG)
|
||||
BKE_reportf(op->reports, RPT_INFO, "KeyingSet '%s' - Successfully added %d Keyframes\n", ks->name, success);
|
||||
BKE_reportf(op->reports, RPT_INFO, "Keying set '%s' - successfully added %d keyframes\n", ks->name, success);
|
||||
|
||||
/* report failure or do updates? */
|
||||
if (success == MODIFYKEY_INVALID_CONTEXT) {
|
||||
BKE_report(op->reports, RPT_ERROR, "No suitable context info for active Keying Set");
|
||||
BKE_report(op->reports, RPT_ERROR, "No suitable context info for active keying set");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
else if (success) {
|
||||
/* if the appropriate properties have been set, make a note that we've inserted something */
|
||||
if (RNA_boolean_get(op->ptr, "confirm_success"))
|
||||
BKE_reportf(op->reports, RPT_INFO, "Successfully added %d Keyframes for KeyingSet '%s'", success, ks->name);
|
||||
BKE_reportf(op->reports, RPT_INFO, "Successfully added %d keyframes for keying set '%s'", success, ks->name);
|
||||
|
||||
/* send notifiers that keyframes have been changed */
|
||||
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
|
||||
}
|
||||
else
|
||||
BKE_report(op->reports, RPT_WARNING, "Keying Set failed to insert any keyframes");
|
||||
BKE_report(op->reports, RPT_WARNING, "Keying set failed to insert any keyframes");
|
||||
|
||||
/* send updates */
|
||||
DAG_ids_flush_update(bmain, 0);
|
||||
@ -1389,19 +1396,19 @@ static int delete_key_exec(bContext *C, wmOperator *op)
|
||||
|
||||
/* report failure or do updates? */
|
||||
if (success == MODIFYKEY_INVALID_CONTEXT) {
|
||||
BKE_report(op->reports, RPT_ERROR, "No suitable context info for active Keying Set");
|
||||
BKE_report(op->reports, RPT_ERROR, "No suitable context info for active keying set");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
else if (success) {
|
||||
/* if the appropriate properties have been set, make a note that we've inserted something */
|
||||
if (RNA_boolean_get(op->ptr, "confirm_success"))
|
||||
BKE_reportf(op->reports, RPT_INFO, "Successfully removed %d Keyframes for KeyingSet '%s'", success, ks->name);
|
||||
BKE_reportf(op->reports, RPT_INFO, "Successfully removed %d keyframes for keying set '%s'", success, ks->name);
|
||||
|
||||
/* send notifiers that keyframes have been changed */
|
||||
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
|
||||
}
|
||||
else
|
||||
BKE_report(op->reports, RPT_WARNING, "Keying Set failed to remove any keyframes");
|
||||
BKE_report(op->reports, RPT_WARNING, "Keying set failed to remove any keyframes");
|
||||
|
||||
/* send updates */
|
||||
DAG_ids_flush_update(bmain, 0);
|
||||
@ -1626,7 +1633,7 @@ static int insert_key_button_exec(bContext *C, wmOperator *op)
|
||||
else {
|
||||
if (G.debug & G_DEBUG)
|
||||
printf("Button Insert-Key: no path to property\n");
|
||||
BKE_report(op->reports, RPT_WARNING, "Failed to resolve path to property. Try using a Keying Set instead");
|
||||
BKE_report(op->reports, RPT_WARNING, "Failed to resolve path to property, try using a keying set instead");
|
||||
}
|
||||
}
|
||||
else if (G.debug & G_DEBUG) {
|
||||
|
@ -161,11 +161,11 @@ static int remove_active_keyingset_exec(bContext *C, wmOperator *op)
|
||||
* - return error if it doesn't exist
|
||||
*/
|
||||
if (scene->active_keyingset == 0) {
|
||||
BKE_report(op->reports, RPT_ERROR, "No active Keying Set to remove");
|
||||
BKE_report(op->reports, RPT_ERROR, "No active keying set to remove");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
else if (scene->active_keyingset < 0) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Cannot remove built in Keying Set");
|
||||
BKE_report(op->reports, RPT_ERROR, "Cannot remove built in keying set");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
else
|
||||
@ -209,7 +209,7 @@ static int add_empty_ks_path_exec(bContext *C, wmOperator *op)
|
||||
* - return error if it doesn't exist
|
||||
*/
|
||||
if (scene->active_keyingset == 0) {
|
||||
BKE_report(op->reports, RPT_ERROR, "No active Keying Set to add empty path to");
|
||||
BKE_report(op->reports, RPT_ERROR, "No active keying set to add empty path to");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
else
|
||||
@ -258,12 +258,12 @@ static int remove_active_ks_path_exec(bContext *C, wmOperator *op)
|
||||
ks->active_path--;
|
||||
}
|
||||
else {
|
||||
BKE_report(op->reports, RPT_ERROR, "No active Keying Set Path to remove");
|
||||
BKE_report(op->reports, RPT_ERROR, "No active keying set path to remove");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
}
|
||||
else {
|
||||
BKE_report(op->reports, RPT_ERROR, "No active Keying Set to remove a path from");
|
||||
BKE_report(op->reports, RPT_ERROR, "No active keying set to remove a path from");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -322,7 +322,7 @@ static int add_keyingset_button_exec(bContext *C, wmOperator *op)
|
||||
scene->active_keyingset = BLI_countlist(&scene->keyingsets);
|
||||
}
|
||||
else if (scene->active_keyingset < 0) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Cannot add property to built in Keying Set");
|
||||
BKE_report(op->reports, RPT_ERROR, "Cannot add property to built in keying set");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
else
|
||||
@ -404,11 +404,11 @@ static int remove_keyingset_button_exec(bContext *C, wmOperator *op)
|
||||
* - return error if it doesn't exist
|
||||
*/
|
||||
if (scene->active_keyingset == 0) {
|
||||
BKE_report(op->reports, RPT_ERROR, "No active Keying Set to remove property from");
|
||||
BKE_report(op->reports, RPT_ERROR, "No active keying set to remove property from");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
else if (scene->active_keyingset < 0) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Cannot remove property from built in Keying Set");
|
||||
BKE_report(op->reports, RPT_ERROR, "Cannot remove property from built in keying set");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
else
|
||||
@ -947,7 +947,7 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
|
||||
/* skip path if no ID pointer is specified */
|
||||
if (ksp->id == NULL) {
|
||||
BKE_reportf(reports, RPT_WARNING,
|
||||
"Skipping path in Keying Set, as it has no ID (KS = '%s', Path = '%s'[%d])",
|
||||
"Skipping path in keying set, as it has no ID (KS = '%s', path = '%s'[%d])",
|
||||
ks->name, ksp->rna_path, ksp->array_index);
|
||||
continue;
|
||||
}
|
||||
|
@ -593,7 +593,7 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
||||
|
||||
/* Check context */
|
||||
if (base == NULL || base->object->type != OB_MESH) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Not an Object or Mesh");
|
||||
BKE_report(op->reports, RPT_ERROR, "Not an object or mesh");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -610,7 +610,7 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
||||
}
|
||||
|
||||
if (!ima) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Not an Image");
|
||||
BKE_report(op->reports, RPT_ERROR, "Not an image");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1124,7 +1124,7 @@ static void mesh_remove_faces(Mesh *mesh, int len)
|
||||
void ED_mesh_geometry_add(Mesh *mesh, ReportList *reports, int verts, int edges, int faces)
|
||||
{
|
||||
if (mesh->edit_btmesh) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't add geometry in edit mode");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot add geometry in edit mode");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1140,12 +1140,12 @@ void ED_mesh_geometry_add(Mesh *mesh, ReportList *reports, int verts, int edges,
|
||||
void ED_mesh_tessfaces_add(Mesh *mesh, ReportList *reports, int count)
|
||||
{
|
||||
if (mesh->edit_btmesh) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't add tessfaces in edit mode");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot add tessfaces in edit mode");
|
||||
return;
|
||||
}
|
||||
|
||||
if (mesh->mpoly) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't add tessfaces to a mesh that already has polygons");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot add tessfaces to a mesh that already has polygons");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1155,7 +1155,7 @@ void ED_mesh_tessfaces_add(Mesh *mesh, ReportList *reports, int count)
|
||||
void ED_mesh_edges_add(Mesh *mesh, ReportList *reports, int count)
|
||||
{
|
||||
if (mesh->edit_btmesh) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't add edges in edit mode");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot add edges in edit mode");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1165,7 +1165,7 @@ void ED_mesh_edges_add(Mesh *mesh, ReportList *reports, int count)
|
||||
void ED_mesh_vertices_add(Mesh *mesh, ReportList *reports, int count)
|
||||
{
|
||||
if (mesh->edit_btmesh) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't add vertices in edit mode");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot add vertices in edit mode");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1175,11 +1175,11 @@ void ED_mesh_vertices_add(Mesh *mesh, ReportList *reports, int count)
|
||||
void ED_mesh_faces_remove(Mesh *mesh, ReportList *reports, int count)
|
||||
{
|
||||
if (mesh->edit_btmesh) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't remove faces in edit mode");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot remove faces in edit mode");
|
||||
return;
|
||||
}
|
||||
else if (count > mesh->totface) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't remove more faces than the mesh contains");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot remove more faces than the mesh contains");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1189,11 +1189,11 @@ void ED_mesh_faces_remove(Mesh *mesh, ReportList *reports, int count)
|
||||
void ED_mesh_edges_remove(Mesh *mesh, ReportList *reports, int count)
|
||||
{
|
||||
if (mesh->edit_btmesh) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't remove edges in edit mode");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot remove edges in edit mode");
|
||||
return;
|
||||
}
|
||||
else if (count > mesh->totedge) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't remove more edges than the mesh contains");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot remove more edges than the mesh contains");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1203,11 +1203,11 @@ void ED_mesh_edges_remove(Mesh *mesh, ReportList *reports, int count)
|
||||
void ED_mesh_vertices_remove(Mesh *mesh, ReportList *reports, int count)
|
||||
{
|
||||
if (mesh->edit_btmesh) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't remove vertices in edit mode");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot remove vertices in edit mode");
|
||||
return;
|
||||
}
|
||||
else if (count > mesh->totvert) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't remove more vertices than the mesh contains");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot remove more vertices than the mesh contains");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1217,7 +1217,7 @@ void ED_mesh_vertices_remove(Mesh *mesh, ReportList *reports, int count)
|
||||
void ED_mesh_loops_add(Mesh *mesh, ReportList *reports, int count)
|
||||
{
|
||||
if (mesh->edit_btmesh) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't add loops in edit mode.");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot add loops in edit mode");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1227,7 +1227,7 @@ void ED_mesh_loops_add(Mesh *mesh, ReportList *reports, int count)
|
||||
void ED_mesh_polys_add(Mesh *mesh, ReportList *reports, int count)
|
||||
{
|
||||
if (mesh->edit_btmesh) {
|
||||
BKE_report(reports, RPT_ERROR, "Can't add polygons in edit mode.");
|
||||
BKE_report(reports, RPT_ERROR, "Cannot add polygons in edit mode");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -113,7 +113,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
|
||||
CustomData vdata, edata, fdata, ldata, pdata;
|
||||
|
||||
if (scene->obedit) {
|
||||
BKE_report(op->reports, RPT_WARNING, "Cant join while in editmode");
|
||||
BKE_report(op->reports, RPT_WARNING, "Cannot join while in editmode");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -161,8 +161,8 @@ int join_mesh_exec(bContext *C, wmOperator *op)
|
||||
}
|
||||
|
||||
if (totvert > MESH_MAX_VERTS) {
|
||||
BKE_reportf(op->reports, RPT_WARNING, "Joining results in %d vertices, limit is " STRINGIFY(MESH_MAX_VERTS), totvert);
|
||||
return OPERATOR_CANCELLED;
|
||||
BKE_reportf(op->reports, RPT_WARNING, "Joining results in %d vertices, limit is %ld", totvert, MESH_MAX_VERTS);
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
/* new material indices and material array */
|
||||
|
@ -380,7 +380,7 @@ static int dynamicPaint_initBake(struct bContext *C, struct wmOperator *op)
|
||||
/* Bake was successful:
|
||||
* Report for ended bake and how long it took */
|
||||
if (status) {
|
||||
/* Format time string */
|
||||
/* Format time string */
|
||||
char time_str[30];
|
||||
double time = PIL_check_seconds_timer() - timer;
|
||||
BLI_timestr(time, time_str);
|
||||
@ -389,11 +389,11 @@ static int dynamicPaint_initBake(struct bContext *C, struct wmOperator *op)
|
||||
BKE_reportf(op->reports, RPT_INFO, "Bake complete! (%s)", time_str);
|
||||
}
|
||||
else {
|
||||
if (strlen(canvas->error)) { /* If an error occured */
|
||||
if (strlen(canvas->error)) { /* If an error occurred */
|
||||
BKE_reportf(op->reports, RPT_ERROR, "Bake failed: %s", canvas->error);
|
||||
}
|
||||
else { /* User canceled the bake */
|
||||
BKE_report(op->reports, RPT_WARNING, "Baking cancelled!");
|
||||
BKE_report(op->reports, RPT_WARNING, "Baking canceled!");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -583,7 +583,7 @@ static int node_group_ungroup_exec(bContext *C, wmOperator *op)
|
||||
ntreeUpdateTree(snode->nodetree);
|
||||
}
|
||||
else {
|
||||
BKE_report(op->reports, RPT_WARNING, "Can't ungroup");
|
||||
BKE_report(op->reports, RPT_WARNING, "Cannot ungroup");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -755,13 +755,13 @@ static int node_group_separate_exec(bContext *C, wmOperator *op)
|
||||
switch (type) {
|
||||
case NODE_GS_COPY:
|
||||
if (!node_group_separate_selected(snode->nodetree, gnode, 1)) {
|
||||
BKE_report(op->reports, RPT_WARNING, "Can't separate nodes");
|
||||
BKE_report(op->reports, RPT_WARNING, "Cannot separate nodes");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
break;
|
||||
case NODE_GS_MOVE:
|
||||
if (!node_group_separate_selected(snode->nodetree, gnode, 0)) {
|
||||
BKE_report(op->reports, RPT_WARNING, "Can't separate nodes");
|
||||
BKE_report(op->reports, RPT_WARNING, "Cannot separate nodes");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
break;
|
||||
@ -1036,7 +1036,7 @@ static int node_group_make_exec(bContext *C, wmOperator *op)
|
||||
int type = RNA_enum_get(op->ptr, "type");
|
||||
|
||||
if (snode->edittree != snode->nodetree) {
|
||||
BKE_report(op->reports, RPT_WARNING, "Can not add a new Group in a Group");
|
||||
BKE_report(op->reports, RPT_WARNING, "Cannot add a new group in a group");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
@ -1049,7 +1049,7 @@ static int node_group_make_exec(bContext *C, wmOperator *op)
|
||||
}
|
||||
|
||||
if (gnode) {
|
||||
BKE_report(op->reports, RPT_WARNING, "Can not add RenderLayer in a Group");
|
||||
BKE_report(op->reports, RPT_WARNING, "Cannot add a Render Layers node in a group");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
}
|
||||
@ -1062,21 +1062,21 @@ static int node_group_make_exec(bContext *C, wmOperator *op)
|
||||
gnode = node_group_make_from_selected(snode->nodetree);
|
||||
}
|
||||
else {
|
||||
BKE_report(op->reports, RPT_WARNING, "Can not make Group");
|
||||
BKE_report(op->reports, RPT_WARNING, "Cannot make group");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
break;
|
||||
case NODE_GM_INSERT:
|
||||
gnode = nodeGetActive(snode->nodetree);
|
||||
if (!gnode || gnode->type != NODE_GROUP) {
|
||||
BKE_report(op->reports, RPT_WARNING, "No active Group node");
|
||||
BKE_report(op->reports, RPT_WARNING, "No active group node");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
if (node_group_make_test(snode->nodetree, gnode)) {
|
||||
node_group_make_insert_selected(snode->nodetree, gnode);
|
||||
}
|
||||
else {
|
||||
BKE_report(op->reports, RPT_WARNING, "Can not insert into Group");
|
||||
BKE_report(op->reports, RPT_WARNING, "Cannot insert into group");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
break;
|
||||
|
@ -1344,7 +1344,7 @@ static int outliner_keyingset_additems_exec(bContext *C, wmOperator *op)
|
||||
|
||||
/* check for invalid states */
|
||||
if (ks == NULL) {
|
||||
BKE_report(op->reports, RPT_ERROR, "Operation requires an Active Keying Set");
|
||||
BKE_report(op->reports, RPT_ERROR, "Operation requires an active keying set");
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
if (soutliner == NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user