merging bullet 2.71 to trunk --> svn merge -r16334:16486 https://svn.blender.org...
authorDaniel Genrich <daniel.genrich@gmx.net>
Fri, 12 Sep 2008 14:09:44 +0000 (14:09 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Fri, 12 Sep 2008 14:09:44 +0000 (14:09 +0000)
intern/SoundSystem/SoundDefines.h
source/blender/blenkernel/intern/particle_system.c
source/blender/src/buttons_scene.c

index 5d425a8dc948a236317ce7963ad9432bdf4754a5..9758fdaadea1cb81a90fa495713ecab4dcd8edb8 100644 (file)
@@ -44,7 +44,7 @@ enum
 
 /* general stuff */
 #define NUM_BUFFERS                                            128
-#define NUM_SOURCES                                            16
+#define NUM_SOURCES                                            32
 
 /* openal related stuff */
 #define AL_LOOPING                                             0x1007
index 077af2851a58a5734ede8e230c5c5f615efac596..3f5911b896bd162be88b9cd2626c163fbfbaa151 100644 (file)
@@ -2678,7 +2678,7 @@ void do_effectors(int pa_no, ParticleData *pa, ParticleKey *state, Object *ob, P
                                                                state->vel,force_field,0, pd->rng, pd->f_noise,charge,pa->size);
                                                }
                                        }
-                                       else if(pd->forcefield==PFIELD_HARMONIC && cfra-framestep <= epa->dietime && cfra>epa->dietime){
+                                       else if(pd && pd->forcefield==PFIELD_HARMONIC && cfra-framestep <= epa->dietime && cfra>epa->dietime){
                                                /* first step after key release */
                                                psys_get_particle_state(eob,epsys,p,&estate,1);
                                                VECADD(vel,vel,estate.vel);
index 5205be3e1b0dba4e79924dc3682806201c39da88..f2e20356f210ba7e2e8c1f683bf131b03c16d9b4 100644 (file)
@@ -211,9 +211,15 @@ void do_soundbuts(unsigned short event)
        case B_SOUND_MENU_SAMPLE:
                if (G.buts->menunr > 0) {
                        sample = BLI_findlink(samples, G.buts->menunr - 1);
-                       if (sample && sound) {
+                       if (sample && sound && sound->sample != sample) {
+                               int wasrelative = (strncmp(sound->name, "//", 2)==0);
+                               
                                BLI_strncpy(sound->name, sample->name, sizeof(sound->name));
                                sound_set_sample(sound, sample);
+                               
+                               if (wasrelative)
+                                       BLI_makestringcode(G.sce, sound->name);
+                                       
                                do_soundbuts(B_SOUND_REDRAW);
                        }
                }