[Bf-blender-cvs] [3c63eee] master: Code cleanup: replace 0 with OB_MODE_OBJECT
Campbell Barton
noreply at git.blender.org
Wed Jun 18 08:02:41 CEST 2014
Commit: 3c63eee7b4ee63619375d2ec57cf2d806e46175a
Author: Campbell Barton
Date: Wed Jun 18 16:01:51 2014 +1000
https://developer.blender.org/rB3c63eee7b4ee63619375d2ec57cf2d806e46175a
Code cleanup: replace 0 with OB_MODE_OBJECT
===================================================================
M source/blender/blenkernel/intern/object.c
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/util/ed_util.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index a3e8ddc..415606d 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1479,7 +1479,7 @@ Object *BKE_object_copy_ex(Main *bmain, Object *ob, bool copy_caches)
defgroup_copy_list(&obn->defbase, &ob->defbase);
BKE_constraints_copy(&obn->constraints, &ob->constraints, true);
- obn->mode = 0;
+ obn->mode = OB_MODE_OBJECT;
obn->sculpt = NULL;
/* increase user numbers */
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 066c4ea..b0edb41 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8924,7 +8924,7 @@ static ID *append_named_part_ex(const bContext *C, Main *mainl, FileData *fd, co
ob->lay = v3d ? v3d->layact : scene->lay;
}
- ob->mode = 0;
+ ob->mode = OB_MODE_OBJECT;
base->lay = ob->lay;
base->object = ob;
ob->id.us++;
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 8b6a1b2..eb79b0c 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -166,7 +166,7 @@ int ED_operator_objectmode(bContext *C)
return 0;
/* add a check for ob->mode too? */
- if (obact && obact->mode)
+ if (obact && (obact->mode != OB_MODE_OBJECT))
return 0;
return 1;
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index 178af8c..4dfaed9 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -96,8 +96,8 @@ void ED_editors_init(bContext *C)
for (ob = bmain->object.first; ob; ob = ob->id.next) {
int mode = ob->mode;
- if (mode && (mode != OB_MODE_POSE)) {
- ob->mode = 0;
+ if (!ELEM(mode, OB_MODE_OBJECT, OB_MODE_POSE)) {
+ ob->mode = OB_MODE_OBJECT;
data = ob->data;
if (ob == obact && !ob->id.lib && !(data && data->lib))
More information about the Bf-blender-cvs
mailing list