Revision: 54010
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54010
Author: sergof
Date: 2013-01-22 20:47:03 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
sim: Remove "continue physics" code
This was left over from 2.4x days and is not used anymore.
Now simulations are always interactive.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_pointcache.h
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
Modified: trunk/blender/source/blender/blenkernel/BKE_pointcache.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_pointcache.h 2013-01-22
19:06:51 UTC (rev 54009)
+++ trunk/blender/source/blender/blenkernel/BKE_pointcache.h 2013-01-22
20:47:03 UTC (rev 54010)
@@ -294,10 +294,6 @@
/* Main cache writing call. */
int BKE_ptcache_write(PTCacheID *pid, unsigned int cfra);
-/****************** Continue physics ***************/
-void BKE_ptcache_set_continue_physics(struct Main *bmain, struct Scene *scene,
int enable);
-int BKE_ptcache_get_continue_physics(void);
-
/******************* Allocate & free ***************/
struct PointCache *BKE_ptcache_add(struct ListBase *ptcaches);
void BKE_ptcache_free_mem(struct ListBase *mem_cache);
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2013-01-22
19:06:51 UTC (rev 54009)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2013-01-22
20:47:03 UTC (rev 54010)
@@ -483,7 +483,7 @@
clmd->sim_parms->dt = clmd->sim_parms->timescale /
clmd->sim_parms->stepsPerFrame;
/* handle continuous simulation with the play button */
- if (BKE_ptcache_get_continue_physics() || ((clmd->sim_parms->preroll >
0) && (framenr > startframe - clmd->sim_parms->preroll) && (framenr <
startframe))) {
+ if ((clmd->sim_parms->preroll > 0) && (framenr > startframe -
clmd->sim_parms->preroll) && (framenr < startframe)) {
BKE_ptcache_invalidate(cache);
/* do simulation */
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c
2013-01-22 19:06:51 UTC (rev 54009)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c
2013-01-22 20:47:03 UTC (rev 54010)
@@ -4500,7 +4500,7 @@
int startframe = 0, endframe = 100, oldtotpart = 0;
/* cache shouldn't be used for hair or "continue physics" */
- if (part->type != PART_HAIR && BKE_ptcache_get_continue_physics() == 0)
{
+ if (part->type != PART_HAIR) {
psys_clear_temp_pointcache(psys);
/* set suitable cache range automatically */
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-01-22
19:06:51 UTC (rev 54009)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-01-22
20:47:03 UTC (rev 54010)
@@ -2536,7 +2536,7 @@
after= 0;
if (mode == PTCACHE_RESET_DEPSGRAPH) {
- if (!(cache->flag & PTCACHE_BAKED) &&
!BKE_ptcache_get_continue_physics()) {
+ if (!(cache->flag & PTCACHE_BAKED)) {
after= 1;
}
@@ -2544,12 +2544,7 @@
cache->flag |= PTCACHE_OUTDATED;
}
else if (mode == PTCACHE_RESET_BAKED) {
- if (!BKE_ptcache_get_continue_physics()) {
- reset= 1;
- clear= 1;
- }
- else
- cache->flag |= PTCACHE_OUTDATED;
+ cache->flag |= PTCACHE_OUTDATED;
}
else if (mode == PTCACHE_RESET_OUTDATED) {
reset = 1;
@@ -2695,30 +2690,6 @@
}
}
-/* Continuous Interaction */
-
-static int CONTINUE_PHYSICS = 0;
-
-void BKE_ptcache_set_continue_physics(Main *bmain, Scene *scene, int enable)
-{
- Object *ob;
-
- if (CONTINUE_PHYSICS != enable) {
- CONTINUE_PHYSICS = enable;
-
- if (CONTINUE_PHYSICS == 0) {
- for (ob=bmain->object.first; ob; ob=ob->id.next)
- if (BKE_ptcache_object_reset(scene, ob,
PTCACHE_RESET_OUTDATED))
- DAG_id_tag_update(&ob->id,
OB_RECALC_DATA);
- }
- }
-}
-
-int BKE_ptcache_get_continue_physics(void)
-{
- return CONTINUE_PHYSICS;
-}
-
/* Point Cache handling */
PointCache *BKE_ptcache_add(ListBase *ptcaches)
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2013-01-22
19:06:51 UTC (rev 54009)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2013-01-22
20:47:03 UTC (rev 54010)
@@ -4108,18 +4108,6 @@
softbody_reset(ob, sb, vertexCos, numVerts);
}
- /* continue physics special case */
- if (BKE_ptcache_get_continue_physics()) {
- BKE_ptcache_invalidate(cache);
- /* do simulation */
- dtime = timescale;
- softbody_update_positions(ob, sb, vertexCos, numVerts);
- softbody_step(scene, ob, sb, dtime);
- softbody_to_object(ob, vertexCos, numVerts, 0);
- sb->last_frame = framenr;
- return;
- }
-
/* still no points? go away */
if (sb->totpoint==0) {
return;
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2013-01-22
19:06:51 UTC (rev 54009)
+++ trunk/blender/source/blender/editors/transform/transform.c 2013-01-22
20:47:03 UTC (rev 54010)
@@ -2124,12 +2124,6 @@
t->state = TRANS_CONFIRM;
}
- if (BKE_ptcache_get_continue_physics()) {
- // TRANSFORM_FIX_ME
- //do_screenhandlers(G.curscreen);
- t->redraw |= TREDRAW_HARD;
- }
-
t->context = NULL;
}
Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h 2013-01-22
19:06:51 UTC (rev 54009)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h 2013-01-22
20:47:03 UTC (rev 54010)
@@ -434,7 +434,7 @@
TIME_WITH_SEQ_AUDIO = (1 << 4), /* DEPRECATED */
TIME_SEQ = (1 << 5),
TIME_ALL_IMAGE_WIN = (1 << 6),
- TIME_CONTINUE_PHYSICS = (1 << 7),
+ TIME_CONTINUE_PHYSICS = (1 << 7), /* UNUSED */
TIME_NODES = (1 << 8),
TIME_CLIPS = (1 << 9),
} eScreen_Redraws_Flag;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_collision.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_collision.c
2013-01-22 19:06:51 UTC (rev 54009)
+++ trunk/blender/source/blender/modifiers/intern/MOD_collision.c
2013-01-22 20:47:03 UTC (rev 54010)
@@ -137,7 +137,7 @@
numverts = dm->getNumVerts(dm);
- if ((current_time > collmd->time_xnew) ||
(BKE_ptcache_get_continue_physics())) {
+ if (current_time > collmd->time_xnew) {
unsigned int i;
/* check if mesh has changed */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
