diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-19 14:40:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-19 14:40:48 +0400 |
| commit | 2457d4f5abd65095ae48be937ed43d026d47124a (patch) | |
| tree | 79c9b666420fa06262c90fa8f9d11ec77e285719 /source/blender/blenkernel/intern/dynamicpaint.c | |
| parent | 5c6ee6b523c6a53c310683a9f7fbe5d730db6122 (diff) | |
| parent | 90ef435145416313596cafa6f8c4c6c6aebe4e44 (diff) | |
svn merge ^/trunk/blender -r42680:42722
Diffstat (limited to 'source/blender/blenkernel/intern/dynamicpaint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index c7a2a3752e9..0c5d5f238ff 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -3214,7 +3214,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, /* hit data */ float hitCoord[3]; int hitFace = -1; - short hitQuad; + short hitQuad = 0; /* Supersampling factor */ if (samples > 1 && surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) @@ -4641,7 +4641,7 @@ static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, Scene *sc #pragma omp parallel for schedule(static) for (index=0; index<sData->total_points; index++) { - float prev_point[3]; + float prev_point[3] = {0.0f, 0.0f, 0.0f}; if (do_velocity_data && !new_bdata) { copy_v3_v3(prev_point, bData->realCoord[bData->s_pos[index]].v); } |