diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-07-04 18:30:05 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-07-04 19:22:10 +0300 |
| commit | 1ba90582f532081dc4b980e79e732e268e2ca96a (patch) | |
| tree | 7761d112257cf33cf3255ba559a41f771120026d /source/blender/gpu | |
| parent | 439fe6568fc5494ef18394612da3eb069bb82483 (diff) | |
Fix a few compiler warnings on OS X / clang.
Two were actual bugs, though they existed only in unused code:
* In Freestyle it was unintentionally copying a scene rather than referencing it.
* In BLI_array_store_is_valid there was use of uninitialized memory.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 095a5b1b66a..fd7f205214e 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -2585,7 +2585,7 @@ int GPU_lamp_shadow_bind_code(GPULamp *lamp) float *GPU_lamp_dynpersmat(GPULamp *lamp) { - return lamp->dynpersmat ? (float *)lamp->dynpersmat : NULL; + return (float*)lamp->dynpersmat; } int GPU_lamp_shadow_layer(GPULamp *lamp) |