Revision: 58753
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58753
Author: nazgul
Date: 2013-07-31 03:44:45 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Use bool instead of int.
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_bake.c
Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c 2013-07-31
03:35:45 UTC (rev 58752)
+++ trunk/blender/source/blender/editors/object/object_bake.c 2013-07-31
03:44:45 UTC (rev 58753)
@@ -107,13 +107,14 @@
int threads;
} MultiresBakeJob;
-static int multiresbake_check(bContext *C, wmOperator *op)
+static bool multiresbake_check(bContext *C, wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
Object *ob;
Mesh *me;
MultiresModifierData *mmd;
- int ok = 1, a;
+ bool ok = true;
+ int a;
CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
{
@@ -122,7 +123,7 @@
if (ob->type != OB_MESH) {
BKE_report(op->reports, RPT_ERROR, "Baking of multires
data only works with an active mesh object");
- ok = 0;
+ ok = false;
break;
}
@@ -137,12 +138,12 @@
for (md = (ModifierData *)mmd->modifier.next; md && ok;
md = md->next) {
if (modifier_isEnabled(scene, md,
eModifierMode_Realtime)) {
- ok = 0;
+ ok = false;
}
}
}
else {
- ok = 0;
+ ok = false;
}
if (!ok) {
@@ -153,14 +154,14 @@
if (mmd->lvl == 0) {
BKE_report(op->reports, RPT_ERROR, "Multires data
baking is not supported for preview subdivision level 0");
- ok = 0;
+ ok = false;
break;
}
if (!me->mtpoly) {
BKE_report(op->reports, RPT_ERROR, "Mesh should be
unwrapped before multires data baking");
- ok = 0;
+ ok = false;
}
else {
a = me->totpoly;
@@ -170,7 +171,7 @@
if (!ima) {
BKE_report(op->reports, RPT_ERROR, "You
should have active texture to use multires baker");
- ok = 0;
+ ok = false;
}
else {
ImBuf *ibuf =
BKE_image_acquire_ibuf(ima, NULL, NULL);
@@ -178,14 +179,14 @@
if (!ibuf) {
BKE_report(op->reports,
RPT_ERROR, "Baking should happen to image with image buffer");
- ok = 0;
+ ok = false;
}
else {
if (ibuf->rect == NULL &&
ibuf->rect_float == NULL)
- ok = 0;
+ ok = false;
if (ibuf->rect_float &&
!(ibuf->channels == 0 || ibuf->channels == 4))
- ok = 0;
+ ok = false;
if (!ok)
BKE_report(op->reports,
RPT_ERROR, "Baking to unsupported image type");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
