diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-16 13:04:34 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-16 13:04:34 +0400 |
commit | a120049c3b4453b7f6179fef47fda020d7058879 (patch) | |
tree | a3a748ff04527d8c54893582162809c25ffbd6e4 /source/blender | |
parent | 547796db531e43b7e228fc7f158931e89b090a74 (diff) |
use psys->seed for smoke random number generator, increase size of MATHUTILS_TOT_CB and reduce float->double conversions.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 2 | ||||
-rw-r--r-- | source/blender/python/mathutils/mathutils.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index ba6e8fe0a3a..009112be2c9 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -969,7 +969,7 @@ static void emit_from_particles(Object *flow_ob, SmokeDomainSettings *sds, Smoke sim.scene = scene; sim.ob = flow_ob; sim.psys = psys; - sim.rng = BLI_rng_new(sim.rng); + sim.rng = BLI_rng_new(psys->seed); if (psys->part->type == PART_HAIR) { diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c index 47600e65351..57b00559a8a 100644 --- a/source/blender/python/mathutils/mathutils.c +++ b/source/blender/python/mathutils/mathutils.c @@ -340,7 +340,7 @@ int mathutils_deepcopy_args_check(PyObject *args) /* Mathutils Callbacks */ /* for mathutils internal use only, eventually should re-alloc but to start with we only have a few users */ -#define MATHUTILS_TOT_CB 13 +#define MATHUTILS_TOT_CB 15 static Mathutils_Callback *mathutils_callbacks[MATHUTILS_TOT_CB] = {NULL}; unsigned char Mathutils_RegisterCallback(Mathutils_Callback *cb) |