Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-10-07 07:57:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-10-07 07:57:14 +0300
commitadfbf276a15346c38cc6b7652191c005b9a3ae9b (patch)
tree6f7d27e9adb8c15d3021c8276d6c577a0e5746ba /source/blender/gpu/intern/gpu_uniformbuffer.c
parent37b457221ec77b485b6e65537ac2db7fd8107e6d (diff)
Cleanup: style, duplicate includes
Diffstat (limited to 'source/blender/gpu/intern/gpu_uniformbuffer.c')
-rw-r--r--source/blender/gpu/intern/gpu_uniformbuffer.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/gpu/intern/gpu_uniformbuffer.c b/source/blender/gpu/intern/gpu_uniformbuffer.c
index 3defbe1e55f..6d52dab5a1f 100644
--- a/source/blender/gpu/intern/gpu_uniformbuffer.c
+++ b/source/blender/gpu/intern/gpu_uniformbuffer.c
@@ -243,8 +243,8 @@ static GPUType get_padded_gpu_type(LinkData *link)
/* Unless the vec3 is followed by a float we need to treat it as a vec4. */
if (gputype == GPU_VEC3 &&
- (link->next != NULL) &&
- (((GPUInput *)link->next->data)->type != GPU_FLOAT))
+ (link->next != NULL) &&
+ (((GPUInput *)link->next->data)->type != GPU_FLOAT))
{
gputype = GPU_VEC4;
}
@@ -368,7 +368,8 @@ int GPU_uniformbuffer_bindpoint(GPUUniformBuffer *ubo)
return ubo->bindpoint;
}
-void GPU_uniformbuffer_tag_dirty(GPUUniformBuffer *ubo_) {
+void GPU_uniformbuffer_tag_dirty(GPUUniformBuffer *ubo_)
+{
BLI_assert(ubo_->type == GPU_UBO_DYNAMIC);
GPUUniformBufferDynamic *ubo = (GPUUniformBufferDynamic *)ubo_;
ubo->flag |= GPU_UBO_FLAG_DIRTY;