kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bug in previous commit today; sound buttons crashed...

Browse Source 
And: renamed "Num" to "Amount" for particle buttons.
This commit is contained in:
Ton Roosendaal 2005-11-10 19:51:20 +00:00
parent d89a7d530b
commit 0dc288371f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/buttons_object.c
View File

@ -1977,7 +1977,7 @@ static void object_panel_particles(Object *ob)
uiDefBut(block, LABEL, 0, "Emit:", 0,150,75,20, NULL, 0.0, 0, 0, 0, ""); uiDefBut(block, LABEL, 0, "Emit:", 0,150,75,20, NULL, 0.0, 0, 0, 0, "");
uiBlockBeginAlign(block); uiBlockBeginAlign(block);
uiDefButI(block, NUM, B_CALCEFFECT, "Num:", 0,130,150,20, &paf->totpart, 1.0, 100000.0, 0, 0, "The total number of particles"); uiDefButI(block, NUM, B_CALCEFFECT, "Amount:", 0,130,150,20, &paf->totpart, 1.0, 100000.0, 0, 0, "The total number of particles");
if(paf->flag & PAF_STATIC) { if(paf->flag & PAF_STATIC) {
uiDefButS(block, NUM, REDRAWVIEW3D, "Step:", 0,110,150,20, &paf->staticstep, 1.0, 100.0, 10, 0, "For static duplicators, the Step value skips particles"); uiDefButS(block, NUM, REDRAWVIEW3D, "Step:", 0,110,150,20, &paf->staticstep, 1.0, 100.0, 10, 0, "For static duplicators, the Step value skips particles");
} }

2
source/blender/src/buttons_scene.c
View File

@ -1459,7 +1459,7 @@ void sound_panels()
/* paranoia check */ /* paranoia check */
sound = G.buts->lockpoin; sound = G.buts->lockpoin;
if( GS(sound->id.name)!=ID_SO) { if(sound && GS(sound->id.name)!=ID_SO) {
sound= NULL; sound= NULL;
G.buts->lockpoin= NULL; G.buts->lockpoin= NULL;
} }