[Bf-blender-cvs] [8aa35aa] alembic_pointcache: Removed the SIMULATION_VALID flag entirely. This was only used by the bake operators.

[Lukas Tönne]

Commit: 8aa35aa0140420523db2ed6259716094df9543d3
Author: Lukas Tönne
Date:   Sat Dec 7 12:38:24 2013 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB8aa35aa0140420523db2ed6259716094df9543d3

Removed the SIMULATION_VALID flag entirely. This was only used by the
bake operators.

===================================================================

M	source/blender/blenkernel/intern/pointcache.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/makesdna/DNA_pointcache_types.h

===================================================================

diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 345a8e1..4335b98 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -3106,7 +3106,7 @@ void BKE_ptcache_load_external(PTCacheID *pid)
 				ptcache_file_close(pf);
 			}
 		}
-		cache->state.flag |= (PTC_STATE_BAKED|PTC_STATE_SIMULATION_VALID_DEPRECATED);
+		cache->state.flag |= PTC_STATE_BAKED;
 		cache->state.flag &= ~(PTC_STATE_OUTDATED|PTC_STATE_FRAMES_SKIPPED);
 	}
 
@@ -3176,14 +3176,12 @@ void BKE_ptcache_update_info(PTCacheID *pid)
 void BKE_ptcache_validate(PointCache *cache, int framenr)
 {
 	if (cache) {
-		cache->state.flag |= PTC_STATE_SIMULATION_VALID_DEPRECATED;
 		cache->state.simframe = framenr;
 	}
 }
 void BKE_ptcache_invalidate(PointCache *cache)
 {
 	if (cache) {
-		cache->state.flag &= ~PTC_STATE_SIMULATION_VALID_DEPRECATED;
 		cache->state.simframe = 0;
 		cache->state.last_exact = MIN2(cache->startframe, 0);
 	}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 104f983..33c65f3 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3580,7 +3580,6 @@ static void direct_link_pointcache(FileData *UNUSED(fd), PointCache *cache)
 	if (!cache)
 		return;
 	
-	cache->state.flag &= ~PTC_STATE_SIMULATION_VALID_DEPRECATED;
 	cache->state.simframe = 0;
 	cache->edit = NULL;
 	cache->free_edit = NULL;
@@ -7369,7 +7368,6 @@ static void do_versions_pointcache(ID *UNUSED(id), PointCache *cache)
 	/* BAKED is not copied, force a rebake */
 	/* REDO_NEEDED is combination of OUTDATED and FRAMES_SKIPPED, no need to copy */
 	if (oldflag & _PTCACHE_OUTDATED_DEPRECATED) cache_state_flag |= PTC_STATE_OUTDATED;
-	if (oldflag & _PTCACHE_SIMULATION_VALID_DEPRECATED) cache_state_flag |= PTC_STATE_SIMULATION_VALID_DEPRECATED;
 	if (oldflag & _PTCACHE_BAKING_DEPRECATED) cache_state_flag |= PTC_STATE_BAKING;
 	if (oldflag & _PTCACHE_FRAMES_SKIPPED_DEPRECATED) cache_state_flag |= PTC_STATE_FRAMES_SKIPPED;
 	if (oldflag & _PTCACHE_READ_INFO_DEPRECATED) cache_state_flag |= PTC_STATE_READ_INFO;
diff --git a/source/blender/makesdna/DNA_pointcache_types.h b/source/blender/makesdna/DNA_pointcache_types.h
index 2979cfa..56c5479 100644
--- a/source/blender/makesdna/DNA_pointcache_types.h
+++ b/source/blender/makesdna/DNA_pointcache_types.h
@@ -98,10 +98,9 @@ typedef struct PointCacheState {
 typedef enum ePointCacheStateFlag {
 	PTC_STATE_BAKED				= 1,
 	PTC_STATE_OUTDATED			= 2,
-	PTC_STATE_SIMULATION_VALID_DEPRECATED	= 4,
-	PTC_STATE_BAKING			= 8,
-	PTC_STATE_FRAMES_SKIPPED	= 16,
-	PTC_STATE_READ_INFO			= 32,
+	PTC_STATE_BAKING			= 4,
+	PTC_STATE_FRAMES_SKIPPED	= 8,
+	PTC_STATE_READ_INFO			= 16,
 	PTC_STATE_REDO_NEEDED		= PTC_STATE_OUTDATED | PTC_STATE_FRAMES_SKIPPED,
 
 	/* high resolution cache is saved for smoke for backwards compatibility, so set this flag to know it's a "fake" cache */