[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56909] tags/blender-2.67a-release/blender : svn merge ^/trunk/blender -c56907 -c56908
Brecht Van Lommel
brechtvanlommel at pandora.be
Sun May 19 06:21:44 CEST 2013
Revision: 56909
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56909
Author: blendix
Date: 2013-05-19 04:21:43 +0000 (Sun, 19 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56907 -c56908
Modified Paths:
--------------
tags/blender-2.67a-release/blender/source/blender/blenkernel/BKE_particle.h
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/anim.c
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/effect.c
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/particle.c
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/particle_system.c
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/smoke.c
Property Changed:
----------------
tags/blender-2.67a-release/blender/
Property changes on: tags/blender-2.67a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56868,56871-56873,56879-56882,56885,56890,56892,56896,56898
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56868,56871-56873,56879-56882,56885,56890,56892,56896,56898,56907-56908
Modified: tags/blender-2.67a-release/blender/source/blender/blenkernel/BKE_particle.h
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/blenkernel/BKE_particle.h 2013-05-19 04:12:00 UTC (rev 56908)
+++ tags/blender-2.67a-release/blender/source/blender/blenkernel/BKE_particle.h 2013-05-19 04:21:43 UTC (rev 56909)
@@ -61,7 +61,6 @@
struct BVHTreeRay;
struct BVHTreeRayHit;
struct EdgeHash;
-struct RNG;
#define PARTICLE_P ParticleData * pa; int p
#define LOOP_PARTICLES for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++)
@@ -83,7 +82,6 @@
struct ParticleSystem *psys;
struct ParticleSystemModifierData *psmd;
struct ListBase *colliders;
- struct RNG *rng;
/* Courant number. This is used to implement an adaptive time step. Only the
* maximum value per time step is important. Only sph_integrate makes use of
* this at the moment. Other solvers could, too. */
Modified: tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/anim.c 2013-05-19 04:12:00 UTC (rev 56908)
+++ tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/anim.c 2013-05-19 04:21:43 UTC (rev 56909)
@@ -1263,7 +1263,6 @@
ChildParticle *cpa = NULL;
ParticleKey state;
ParticleCacheKey *cache;
- RNG *rng = NULL;
float ctime, pa_time, scale = 1.0f;
float tmat[4][4], mat[4][4], pamat[4][4], vec[3], size = 0.0;
float (*obmat)[4], (*oldobmat)[4];
@@ -1294,9 +1293,14 @@
totpart = psys->totpart;
totchild = psys->totchild;
+ BLI_srandom(31415926 + psys->seed);
+
if ((psys->renderdata || part->draw_as == PART_DRAW_REND) && ELEM(part->ren_as, PART_DRAW_OB, PART_DRAW_GR)) {
ParticleSimulationData sim = {NULL};
-
+ sim.scene = scene;
+ sim.ob = par;
+ sim.psys = psys;
+ sim.psmd = psys_get_modifier(par, psys);
/* make sure emitter imat is in global coordinates instead of render view coordinates */
invert_m4_m4(par->imat, par->obmat);
@@ -1328,12 +1332,6 @@
psys_check_group_weights(part);
- sim.scene = scene;
- sim.ob = par;
- sim.psys = psys;
- sim.psmd = psys_get_modifier(par, psys);
- sim.rng = BLI_rng_new(0);
-
psys->lattice = psys_get_lattice(&sim);
/* gather list of objects or single object */
@@ -1380,8 +1378,6 @@
obcopy = *ob;
}
- rng = BLI_rng_new_srandom(31415926 + psys->seed);
-
if (totchild == 0 || part->draw & PART_DRAW_PARENT)
a = 0;
else
@@ -1421,7 +1417,7 @@
/* for groups, pick the object based on settings */
if (part->draw & PART_DRAW_RAND_GR)
- b = BLI_rng_get_int(rng) % totgroup;
+ b = BLI_rand() % totgroup;
else
b = a % totgroup;
@@ -1565,8 +1561,6 @@
}
else
*ob = obcopy;
-
- BLI_rng_free(sim.rng);
}
/* clean up */
@@ -1579,9 +1573,6 @@
end_latt_deform(psys->lattice);
psys->lattice = NULL;
}
-
- if (rng)
- BLI_rng_free(rng);
}
static Object *find_family_object(Object **obar, char *family, char ch)
Modified: tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/effect.c 2013-05-19 04:12:00 UTC (rev 56908)
+++ tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/effect.c 2013-05-19 04:21:43 UTC (rev 56909)
@@ -619,7 +619,6 @@
sim.scene= eff->scene;
sim.ob= eff->ob;
sim.psys= eff->psys;
- sim.rng= NULL;
/* TODO: time from actual previous calculated frame (step might not be 1) */
state.time = cfra - 1.0f;
Modified: tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/particle.c 2013-05-19 04:12:00 UTC (rev 56908)
+++ tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/particle.c 2013-05-19 04:21:43 UTC (rev 56909)
@@ -264,12 +264,11 @@
{
int i;
float *rand = psys->frand = MEM_callocN(PSYS_FRAND_COUNT * sizeof(float), "particle randoms");
- RNG *rng = BLI_rng_new_srandom(psys->seed);
- for (i = 0; i < 1024; i++, rand++)
- *rand = BLI_rng_get_float(rng);
+ BLI_srandom(psys->seed);
- BLI_rng_free(rng);
+ for (i = 0; i < 1024; i++, rand++)
+ *rand = BLI_frand();
}
int psys_check_enabled(Object *ob, ParticleSystem *psys)
{
@@ -3303,11 +3302,8 @@
sim.ob = ob;
sim.psys = psys;
sim.psmd = psys_get_modifier(ob, psys);
- sim.rng = BLI_rng_new(0);
psys_cache_child_paths(&sim, cfra, 1);
-
- BLI_rng_free(sim.rng);
}
/* clear recalc flag if set here */
@@ -4664,7 +4660,6 @@
sim.ob = ob;
sim.psys = psys;
sim.psmd = psys_get_modifier(ob, psys);
- sim.rng = BLI_rng_new(0);
psys->lattice = psys_get_lattice(&sim);
@@ -4692,6 +4687,4 @@
/* protect the applied shape */
psys->flag |= PSYS_EDITED;
}
-
- BLI_rng_free(sim.rng);
}
Modified: tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/particle_system.c 2013-05-19 04:12:00 UTC (rev 56908)
+++ tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/particle_system.c 2013-05-19 04:21:43 UTC (rev 56909)
@@ -423,7 +423,7 @@
}
}
-static void distribute_simple_children(Scene *scene, Object *ob, DerivedMesh *finaldm, ParticleSystem *psys, RNG *rng)
+static void distribute_simple_children(Scene *scene, Object *ob, DerivedMesh *finaldm, ParticleSystem *psys)
{
ChildParticle *cpa = NULL;
int i, p;
@@ -440,9 +440,9 @@
/* create even spherical distribution inside unit sphere */
while (length>=1.0f) {
- cpa->fuv[0]=2.0f*BLI_rng_get_float(rng)-1.0f;
- cpa->fuv[1]=2.0f*BLI_rng_get_float(rng)-1.0f;
- cpa->fuv[2]=2.0f*BLI_rng_get_float(rng)-1.0f;
+ cpa->fuv[0]=2.0f*BLI_frand()-1.0f;
+ cpa->fuv[1]=2.0f*BLI_frand()-1.0f;
+ cpa->fuv[2]=2.0f*BLI_frand()-1.0f;
length=len_v3(cpa->fuv);
}
@@ -872,7 +872,7 @@
pa->foffset *= ctx->jit[p % (2 * ctx->jitlevel)];
break;
case PART_DISTR_RAND:
- pa->foffset *= BLI_rng_get_float(ctx->sim.rng);
+ pa->foffset *= BLI_frand();
break;
}
}
@@ -1065,15 +1065,15 @@
if (from == PART_FROM_CHILD) {
/* Simple children */
if (part->childtype != PART_CHILD_FACES) {
- BLI_rng_srandom(ctx->sim.rng, 31415926 + psys->seed + psys->child_seed);
- distribute_simple_children(scene, ob, finaldm, psys, ctx->sim.rng);
+ BLI_srandom(31415926 + psys->seed + psys->child_seed);
+ distribute_simple_children(scene, ob, finaldm, psys);
return 0;
}
}
else {
/* Grid distribution */
if (part->distr==PART_DISTR_GRID && from != PART_FROM_VERT) {
- BLI_rng_srandom(ctx->sim.rng, 31415926 + psys->seed);
+ BLI_srandom(31415926 + psys->seed);
dm= CDDM_from_mesh((Mesh*)ob->data, ob);
DM_ensure_tessface(dm);
distribute_grid(dm,psys);
@@ -1085,7 +1085,7 @@
/* Create trees and original coordinates if needed */
if (from == PART_FROM_CHILD) {
distr=PART_DISTR_RAND;
- BLI_rng_srandom(ctx->sim.rng, 31415926 + psys->seed + psys->child_seed);
+ BLI_srandom(31415926 + psys->seed + psys->child_seed);
dm= finaldm;
/* BMESH ONLY */
@@ -1108,7 +1108,7 @@
}
else {
distr = part->distr;
- BLI_rng_srandom(ctx->sim.rng, 31415926 + psys->seed);
+ BLI_srandom(31415926 + psys->seed);
dm= CDDM_from_mesh((Mesh*)ob->data, ob);
@@ -1264,7 +1264,7 @@
for (p=0; p<totpart; p++) {
/* In theory element_sum[totelem] should be 1.0, but due to float errors this is not necessarily always true, so scale pos accordingly. */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list