forked from bartvdbraak/blender
More UI messages fixes and tweaks.
This commit is contained in:
parent
b12bf2216f
commit
2149886033
@ -350,7 +350,7 @@ static int initialize_internal_images(BakeImages *bake_images, ReportList *repor
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
BKE_image_release_ibuf(bk_image->image, ibuf, lock);
|
BKE_image_release_ibuf(bk_image->image, ibuf, lock);
|
||||||
BKE_reportf(reports, RPT_ERROR, "Not initialized image %s", bk_image->image->id.name + 2);
|
BKE_reportf(reports, RPT_ERROR, "Uninitialized image %s", bk_image->image->id.name + 2);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
BKE_image_release_ibuf(bk_image->image, ibuf, lock);
|
BKE_image_release_ibuf(bk_image->image, ibuf, lock);
|
||||||
@ -439,13 +439,13 @@ static int bake(
|
|||||||
if (tot_materials == 0) {
|
if (tot_materials == 0) {
|
||||||
if (is_save_internal) {
|
if (is_save_internal) {
|
||||||
BKE_report(reports, RPT_ERROR,
|
BKE_report(reports, RPT_ERROR,
|
||||||
"No active image found. Add a material or bake to an external file");
|
"No active image found, add a material or bake to an external file");
|
||||||
|
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
else if (is_split_materials) {
|
else if (is_split_materials) {
|
||||||
BKE_report(reports, RPT_ERROR,
|
BKE_report(reports, RPT_ERROR,
|
||||||
"No active image found. Add a material or bake without the Split Materials option");
|
"No active image found, add a material or bake without the Split Materials option");
|
||||||
|
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
@ -416,8 +416,8 @@ static int nlachannels_pushdown_exec(bContext *C, wmOperator *op)
|
|||||||
|
|
||||||
/* active animdata block */
|
/* active animdata block */
|
||||||
if (nla_panel_context(C, &adt_ptr, NULL, NULL) == 0 || (adt_ptr.data == NULL)) {
|
if (nla_panel_context(C, &adt_ptr, NULL, NULL) == 0 || (adt_ptr.data == NULL)) {
|
||||||
BKE_report(op->reports, RPT_ERROR, "No active AnimData block to use. "
|
BKE_report(op->reports, RPT_ERROR, "No active AnimData block to use "
|
||||||
"Select a datablock expander first or set the appropriate flags on an AnimData block");
|
"(select a datablock expander first or set the appropriate flags on an AnimData block)");
|
||||||
return OPERATOR_CANCELLED;
|
return OPERATOR_CANCELLED;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -437,12 +437,12 @@ static int nlachannels_pushdown_exec(bContext *C, wmOperator *op)
|
|||||||
/* get channel from index */
|
/* get channel from index */
|
||||||
ale = BLI_findlink(&anim_data, channel_index);
|
ale = BLI_findlink(&anim_data, channel_index);
|
||||||
if (ale == NULL) {
|
if (ale == NULL) {
|
||||||
BKE_reportf(op->reports, RPT_ERROR, "No animation channel found at index = %d", channel_index);
|
BKE_reportf(op->reports, RPT_ERROR, "No animation channel found at index %d", channel_index);
|
||||||
BLI_freelistN(&anim_data);
|
BLI_freelistN(&anim_data);
|
||||||
return OPERATOR_CANCELLED;
|
return OPERATOR_CANCELLED;
|
||||||
}
|
}
|
||||||
else if (ale->type != ANIMTYPE_NLAACTION) {
|
else if (ale->type != ANIMTYPE_NLAACTION) {
|
||||||
BKE_reportf(op->reports, RPT_ERROR, "Animation channel at index = %d is not a NLA 'Active Action' channel", channel_index);
|
BKE_reportf(op->reports, RPT_ERROR, "Animation channel at index %d is not a NLA 'Active Action' channel", channel_index);
|
||||||
BLI_freelistN(&anim_data);
|
BLI_freelistN(&anim_data);
|
||||||
return OPERATOR_CANCELLED;
|
return OPERATOR_CANCELLED;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user