Commit: c58757006d17b4d0cf97ce1e3cde85fff37a5e3a
Author: Campbell Barton
Date: Mon Aug 17 14:22:23 2015 +1000
Branches: master
https://developer.blender.org/rBc58757006d17b4d0cf97ce1e3cde85fff37a5e3a
Cleanup: remove unused Object.ipoflag
===================================================================
M source/blender/blenkernel/intern/object.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/editors/space_view3d/drawarmature.c
M source/blender/makesdna/DNA_object_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index d965e83..6aaf62d 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2093,13 +2093,9 @@ static void ob_parcurve(Scene *scene, Object *ob, Object
*par, float mat[4][4])
if (par->curve_cache == NULL) /* only happens on reload file, but
violates depsgraph still... fix! */
BKE_displist_make_curveTypes(scene, par, 0);
if (par->curve_cache->path == NULL) return;
-
- /* catch exceptions: feature for nla stride editing */
- if (ob->ipoflag & OB_DISABLE_PATH) {
- ctime = 0.0f;
- }
+
/* catch exceptions: curve paths used as a duplicator */
- else if (enable_cu_speed) {
+ if (enable_cu_speed) {
/* ctime is now a proper var setting of Curve which gets set by
Animato like any other var that's animated,
* but this will only work if it actually is animated...
*
diff --git a/source/blender/blenloader/intern/versioning_legacy.c
b/source/blender/blenloader/intern/versioning_legacy.c
index dcfafc2..12069fd 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -648,7 +648,6 @@ void blo_do_versions_pre250(FileData *fd, Library *lib,
Main *main)
while (ob) {
if (ob->transflag & 1) {
ob->transflag -= 1;
- //ob->ipoflag |= OB_OFFS_OB;
}
ob = ob->id.next;
}
@@ -685,7 +684,6 @@ void blo_do_versions_pre250(FileData *fd, Library *lib,
Main *main)
}
ob = main->object.first;
while (ob) {
- //ob->ipoflag |= OB_OFFS_PARENT;
if (ob->dt == 0)
ob->dt = OB_SOLID;
ob = ob->id.next;
diff --git a/source/blender/editors/space_view3d/drawarmature.c
b/source/blender/editors/space_view3d/drawarmature.c
index f33f074..fa88397 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -2366,7 +2366,7 @@ static void draw_ghost_poses_range(Scene *scene, View3D
*v3d, ARegion *ar, Base
bArmature *arm = ob->data;
bPose *posen, *poseo;
float start, end, stepsize, range, colfac;
- int cfrao, flago, ipoflago;
+ int cfrao, flago;
start = (float)arm->ghostsf;
end = (float)arm->ghostef;
@@ -2381,8 +2381,6 @@ static void draw_ghost_poses_range(Scene *scene, View3D
*v3d, ARegion *ar, Base
cfrao = CFRA;
flago = arm->flag;
arm->flag &= ~(ARM_DRAWNAMES | ARM_DRAWAXES);
- ipoflago = ob->ipoflag;
- ob->ipoflag |= OB_DISABLE_PATH;
/* copy the pose */
poseo = ob->pose;
@@ -2418,7 +2416,6 @@ static void draw_ghost_poses_range(Scene *scene, View3D
*v3d, ARegion *ar, Base
ob->pose = poseo;
arm->flag = flago;
ob->mode |= OB_MODE_POSE;
- ob->ipoflag = ipoflago;
}
/* draw ghosts on keyframes in action within range
@@ -2462,8 +2459,7 @@ static void draw_ghost_poses_keys(Scene *scene, View3D
*v3d, ARegion *ar, Base *
cfrao = CFRA;
flago = arm->flag;
arm->flag &= ~(ARM_DRAWNAMES | ARM_DRAWAXES);
- ob->ipoflag |= OB_DISABLE_PATH;
-
+
/* copy the pose */
poseo = ob->pose;
BKE_pose_copy_data(&posen, ob->pose, 1);
diff --git a/source/blender/makesdna/DNA_object_types.h
b/source/blender/makesdna/DNA_object_types.h
index 2937be7..faae78a 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -183,17 +183,16 @@ typedef struct Object {
short transflag, protectflag; /* transformation settings and
transform locks */
short trackflag, upflag;
short nlaflag; /* used for DopeSheet filtering
settings (expanded/collapsed) */
- short ipoflag; // xxx deprecated... old
animation system
short scaflag; /* ui state for game logic */
char scavisflag; /* more display settings for
game logic */
char depsflag;
- /* dupli-frame settings */
- int dupon, dupoff, dupsta, dupend;
-
/* did last modifier stack generation need mapping support? */
char lastNeedMapping; /* bool */
- char pad[3];
+ char pad[5];
+
+ /* dupli-frame settings */
+ int dupon, dupoff, dupsta, dupend;
/* during realtime */
@@ -417,13 +416,6 @@ enum {
OB_DUPLI = OB_DUPLIFRAMES | OB_DUPLIVERTS | OB_DUPLIGROUP |
OB_DUPLIFACES | OB_DUPLIPARTS,
};
-/* (short) ipoflag */
-/* XXX: many old flags for features removed due to incompatibility
- * with new system and/or other design issues were here
- */
- /* for stride/path editing (XXX: NEEDS REVIEW) */
-#define OB_DISABLE_PATH (1 << 10)
-
/* (short) trackflag / upflag */
enum {
OB_POSX = 0,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
