archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

no functional change: only check against OB_RECALC_ALL but don't use for assignment.

Browse Source 
Makes adding new flags give ambiguous results and also makes it less easy to tell whats intended.
In some places it looks like OB_RECALC_TIME should be left out too.
This commit is contained in:
Campbell Barton
2010-12-17 15:51:42 +00:00
parent 902b239aa8
commit f90a2123ee
16 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/exotic.c
View File

@@ -2376,7 +2376,7 @@ static void dxf_read(Scene *scene, const char *filename)
ob->dupon= 1; ob->dupoff= 0;
ob->dupsta= 1; ob->dupend= 100;
ob->recalc= OB_RECALC_ALL; /* needed because of weird way of adding libdata directly */
ob->recalc= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME; /* needed because of weird way of adding libdata directly */
ob->data= obdata;
((ID*)ob->data)->us++;

2
source/blender/blenkernel/intern/library.c
View File

@@ -450,7 +450,7 @@ void recalc_all_library_objects(Main *main)
/* flag for full recalc */
for(ob=main->object.first; ob; ob=ob->id.next)
if(ob->id.lib)
ob->recalc |= OB_RECALC_ALL;
ob->recalc |= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME;
}
/* note: MAX_LIBARRAY define should match this code */

14
source/blender/blenkernel/intern/object.c
View File

@@ -316,7 +316,7 @@ static void unlink_object__unlinkModifierLinks(void *userData, Object *ob, Objec
if (*obpoin==unlinkOb) {
*obpoin = NULL;
ob->recalc |= OB_RECALC_ALL; // XXX: should this just be OB_RECALC_DATA?
ob->recalc |= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME; // XXX: should this just be OB_RECALC_DATA?
}
}
@@ -357,7 +357,7 @@ void unlink_object(Object *ob)
if(obt->parent==ob) {
obt->parent= NULL;
obt->recalc |= OB_RECALC_ALL;
obt->recalc |= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME;
}
modifiers_foreachObjectLink(obt, unlink_object__unlinkModifierLinks, ob);
@@ -367,15 +367,15 @@ void unlink_object(Object *ob)
if(cu->bevobj==ob) {
cu->bevobj= NULL;
obt->recalc |= OB_RECALC_ALL;
obt->recalc |= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME;
}
if(cu->taperobj==ob) {
cu->taperobj= NULL;
obt->recalc |= OB_RECALC_ALL;
obt->recalc |= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME;
}
if(cu->textoncurve==ob) {
cu->textoncurve= NULL;
obt->recalc |= OB_RECALC_ALL;
obt->recalc |= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME;
}
}
else if(obt->type==OB_ARMATURE && obt->pose) {
@@ -1078,7 +1078,7 @@ Object *add_object(struct Scene *scene, int type)
base= scene_add_base(scene, ob);
scene_select_base(scene, base);
ob->recalc |= OB_RECALC_ALL;
ob->recalc |= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME;
return ob;
}
@@ -1538,7 +1538,7 @@ void object_make_proxy(Object *ob, Object *target, Object *gob)
ob->proxy_group= gob;
id_lib_extern(&target->id);
ob->recalc= target->recalc= OB_RECALC_ALL;
ob->recalc= target->recalc= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME;
/* copy transform
* - gob means this proxy comes from a group, just apply the matrix