archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

add missing break to space-buttons listener, also rewind own recent change (uiPopupBlockHandle.retvec size)

Browse Source
This commit is contained in:
Campbell Barton
2013-07-25 12:46:20 +00:00
parent 62b541faa3
commit 40d9ab1139
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/pointcache.c
View File

@@ -268,8 +268,9 @@ static int ptcache_particle_write(int index, void *psys_v, void **data, int cfr
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 @@ static void ptcache_particle_read(int index, void *psys_v, void **data, float cf
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];

2
source/blender/editors/interface/interface_intern.h
View File

@@ -452,7 +452,7 @@ struct uiPopupBlockHandle {
int butretval;
int menuretval;
float retvalue;
float retvec[3];
float retvec[4];
/* menu direction */
int direction;

1
source/blender/editors/space_buttons/space_buttons.c
View File

@@ -266,6 +266,7 @@ static void buttons_area_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *
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);