[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58599] trunk/blender/source/blender: add missing break to space-buttons listener, also rewind own recent change (uiPopupBlockHandle.retvec size)

[Campbell Barton]

Revision: 58599
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58599
Author:   campbellbarton
Date:     2013-07-25 12:46:20 +0000 (Thu, 25 Jul 2013)
Log Message:
-----------
add missing break to space-buttons listener, also rewind own recent change (uiPopupBlockHandle.retvec size)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/pointcache.c
    trunk/blender/source/blender/editors/interface/interface_intern.h
    trunk/blender/source/blender/editors/space_buttons/space_buttons.c

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2013-07-25 12:37:22 UTC (rev 58598)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2013-07-25 12:46:20 UTC (rev 58599)
@@ -268,8 +268,9 @@
 	PTCACHE_DATA_FROM(data, BPHYS_DATA_SIZE, &pa->size);
 	PTCACHE_DATA_FROM(data, BPHYS_DATA_TIMES, times);
 
-	if (boid)
+	if (boid) {
 		PTCACHE_DATA_FROM(data, BPHYS_DATA_BOIDS, &boid->data);
+	}
 
 	/* return flag 1+1=2 for newly born particles to copy exact birth location to previously cached frame */
 	return 1 + (pa->state.time >= pa->time && pa->prev_state.time <= pa->time);
@@ -304,8 +305,9 @@
 	else if (cfra > pa->dietime)
 		pa->state.time = pa->dietime;
 
-	if (data[BPHYS_DATA_SIZE])
+	if (data[BPHYS_DATA_SIZE]) {
 		PTCACHE_DATA_TO(data, BPHYS_DATA_SIZE, 0, &pa->size);
+	}
 	
 	if (data[BPHYS_DATA_TIMES]) {
 		float times[3];

Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_intern.h	2013-07-25 12:37:22 UTC (rev 58598)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h	2013-07-25 12:46:20 UTC (rev 58599)
@@ -452,7 +452,7 @@
 	int butretval;
 	int menuretval;
 	float retvalue;
-	float retvec[3];
+	float retvec[4];
 
 	/* menu direction */
 	int direction;

Modified: trunk/blender/source/blender/editors/space_buttons/space_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2013-07-25 12:37:22 UTC (rev 58598)
+++ trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2013-07-25 12:46:20 UTC (rev 58599)
@@ -266,6 +266,7 @@
 					break;
 				case ND_POSE:
 					buttons_area_redraw(sa, BCONTEXT_DATA);
+					break;
 				case ND_BONE_ACTIVE:
 				case ND_BONE_SELECT:
 					buttons_area_redraw(sa, BCONTEXT_BONE);