[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25117] trunk/blender: * Fix for incorrect disabling after baking cloth sim

[Matt Ebb]

Revision: 25117
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25117
Author:   broken
Date:     2009-12-04 05:28:50 +0100 (Fri, 04 Dec 2009)

Log Message:
-----------
* Fix for incorrect disabling after baking cloth sim
* Fix for time cursor getting 'stuck' after baking point caches

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_physics_cloth.py
    trunk/blender/source/blender/blenkernel/BKE_pointcache.h
    trunk/blender/source/blender/blenkernel/intern/pointcache.c
    trunk/blender/source/blender/editors/physics/physics_pointcache.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c
    trunk/blender/source/blender/windowmanager/intern/wm_cursors.c

Modified: trunk/blender/release/scripts/ui/properties_physics_cloth.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_cloth.py	2009-12-04 03:51:52 UTC (rev 25116)
+++ trunk/blender/release/scripts/ui/properties_physics_cloth.py	2009-12-04 04:28:50 UTC (rev 25117)
@@ -83,9 +83,9 @@
         if md:
             cloth = md.settings
 
-            layout.active = cloth_panel_enabled(md)
-
             split = layout.split()
+            
+            split.active = cloth_panel_enabled(md)
 
             col = split.column()
 

Modified: trunk/blender/source/blender/blenkernel/BKE_pointcache.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_pointcache.h	2009-12-04 03:51:52 UTC (rev 25116)
+++ trunk/blender/source/blender/blenkernel/BKE_pointcache.h	2009-12-04 04:28:50 UTC (rev 25117)
@@ -151,6 +151,7 @@
 	int (*break_test)(void *data);
 	void *break_data;
 	void (*progressbar)(void *data, int num);
+	void (*progressend)(void *data);
 	void *progresscontext;
 } PTCacheBaker;
 

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2009-12-04 03:51:52 UTC (rev 25116)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2009-12-04 04:28:50 UTC (rev 25117)
@@ -2232,6 +2232,7 @@
 	baker.break_test=NULL;
 	baker.pid=NULL;
 	baker.progressbar=NULL;
+	baker.progressend=NULL;
 	baker.progresscontext=NULL;
 	baker.render=0;
 	baker.anim_init = 0;
@@ -2360,6 +2361,7 @@
 		if(baker->break_test && baker->break_test(baker->break_data))
 			break;
 	}
+	baker->progressend(baker->progresscontext);
 
 	/* clear baking flag */
 	if(pid) {
@@ -2400,7 +2402,7 @@
 
 	scene->r.framelen = frameleno;
 	CFRA = cfrao;
-
+	
 	if(bake) /* already on cfra unless baking */
 		scene_update_for_newframe(scene, scene->lay);
 

Modified: trunk/blender/source/blender/editors/physics/physics_pointcache.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_pointcache.c	2009-12-04 03:51:52 UTC (rev 25116)
+++ trunk/blender/source/blender/editors/physics/physics_pointcache.c	2009-12-04 04:28:50 UTC (rev 25117)
@@ -109,9 +109,11 @@
 
 	if (win) {
 		baker.progressbar = (void (*)(void *, int))WM_timecursor;
+		baker.progressend = (void (*)(void *))WM_cursor_restore;
 		baker.progresscontext = win;
 	} else {
 		baker.progressbar = bake_console_progress;
+		baker.progressend = NULL;
 		baker.progresscontext = NULL;
 	}
 
@@ -200,10 +202,12 @@
 
 	if (win) {
 		baker.progressbar = (void (*)(void *, int))WM_timecursor;
+		baker.progressend = (void (*)(void *))WM_cursor_restore;
 		baker.progresscontext = win;
 	} else {
 		printf("\n"); /* empty first line before console reports */
 		baker.progressbar = bake_console_progress;
+		baker.progressend = NULL;
 		baker.progresscontext = NULL;
 	}
 

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2009-12-04 03:51:52 UTC (rev 25116)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2009-12-04 04:28:50 UTC (rev 25117)
@@ -4174,7 +4174,6 @@
 	ParticleEditSettings *pset = PE_settings(scene);
 	int i, k, totpoint = edit->totpoint, timed = pset->flag & PE_FADE_TIME ? pset->fade_frames : 0;
 	int steps=1;
-	char nosel[4], sel[4];
 	float sel_col[3];
 	float nosel_col[3];
 	float *pathcol = NULL, *pcol;

Modified: trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_cursors.c	2009-12-04 03:51:52 UTC (rev 25116)
+++ trunk/blender/source/blender/windowmanager/intern/wm_cursors.c	2009-12-04 04:28:50 UTC (rev 25117)
@@ -212,7 +212,7 @@
 	unsigned char bitmap[16][2];
 	int i, idx;
 	
-	if(win->lastcursor != 0)
+	if(win->lastcursor == 0)
 		win->lastcursor= win->cursor; 
 	
 	memset(&bitmap, 0x00, sizeof(bitmap));