diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-01 13:06:05 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-01 13:06:05 +0300 |
| commit | 28ea3f5b94175edcfd27612cf56d69106879d9a4 (patch) | |
| tree | 7d3d275202206f1a276d6b8a780de486e246a91b /source/blender/gpu | |
| parent | 94d80c8ca4739ff8bbc406157812b52a74286370 (diff) | |
Fix T44565 World background artifacts when world shader is void (or
compilation fails).
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/GPU_material.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index b61bdf969cc..7bb044a1ae3 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -186,7 +186,7 @@ bool GPU_lamp_override_visible(GPULamp *lamp, struct SceneRenderLayer *srl, stru void GPU_material_bind(GPUMaterial *material, int oblay, int viewlay, double time, int mipmap, float viewmat[4][4], float viewinv[4][4], float cameraborder[4], bool scenelock); void GPU_material_bind_uniforms(GPUMaterial *material, float obmat[4][4], float obcol[4], float autobumpscale); void GPU_material_unbind(GPUMaterial *material); -int GPU_material_bound(GPUMaterial *material); +bool GPU_material_bound(GPUMaterial *material); struct Scene *GPU_material_scene(GPUMaterial *material); GPUMatType GPU_Material_get_type(GPUMaterial *material); diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 4d46ef3af7b..12672b5f5af 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -102,7 +102,6 @@ struct GPUMaterial { /* for binding the material */ GPUPass *pass; GPUVertexAttribs attribs; - int bound; int builtins; int alpha, obcolalpha; int dynproperty; @@ -114,6 +113,7 @@ struct GPUMaterial { int cameratexcofacloc; ListBase lamps; + bool bound; }; struct GPULamp { @@ -400,7 +400,7 @@ void GPU_material_unbind(GPUMaterial *material) } } -int GPU_material_bound(GPUMaterial *material) +bool GPU_material_bound(GPUMaterial *material) { return material->bound; } |