diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-28 00:27:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-28 00:27:07 +0400 |
| commit | d15d78a33a8df76b02fa0d27dacd85c8a77ec109 (patch) | |
| tree | 908e12a6f0171fa8f5f1ad775b1fffe56531e588 /source/blender/gpu/intern | |
| parent | 535253cad0cbf27485d6390039fab6e339a441a4 (diff) | |
style cleanup: osl and NULL pointer use, also correct sequencer gap operator id's
Diffstat (limited to 'source/blender/gpu/intern')
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index c7a421a49fc..c455e8f7642 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -402,7 +402,7 @@ static GPUTexture *GPU_texture_create_nD(int w, int h, int n, float *fpixels, in } else { glTexImage2D(tex->target, 0, internalformat, tex->w, tex->h, 0, - format, type, NULL); + format, type, NULL); if (fpixels) { glTexSubImage2D(tex->target, 0, 0, 0, w, h, @@ -677,7 +677,7 @@ GPUTexture *GPU_texture_create_vsm_shadow_map(int size, char err_out[256]) /* Now we tweak some of the settings */ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RG32F, size, size, 0, GL_RG, GL_FLOAT, 0); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RG32F, size, size, 0, GL_RG, GL_FLOAT, NULL); GPU_texture_unbind(tex); } |