[Bf-blender-cvs] [f638ad61b88] blender2.8: Rename: GPU_material_get_uniform_buffer > GPU_material_uniform_buffer_get

[Dalai Felinto]

Commit: f638ad61b88cbd1ca794b2a4993f20f3bc833da8
Author: Dalai Felinto
Date:   Fri Jun 8 15:54:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf638ad61b88cbd1ca794b2a4993f20f3bc833da8

Rename: GPU_material_get_uniform_buffer > GPU_material_uniform_buffer_get

===================================================================

M       source/blender/draw/intern/draw_manager_data.c
M       source/blender/gpu/GPU_material.h
M       source/blender/gpu/intern/gpu_material.c

===================================================================

diff --git a/source/blender/draw/intern/draw_manager_data.c 
b/source/blender/draw/intern/draw_manager_data.c
index 09890107fa3..b49af47223f 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -799,7 +799,7 @@ static DRWShadingGroup 
*drw_shgroup_material_inputs(DRWShadingGroup *grp, struct
                }
        }
 
-       GPUUniformBuffer *ubo = GPU_material_get_uniform_buffer(material);
+       GPUUniformBuffer *ubo = GPU_material_uniform_buffer_get(material);
        if (ubo != NULL) {
                DRW_shgroup_uniform_block(grp, GPU_UBO_BLOCK_NAME, ubo);
        }
diff --git a/source/blender/gpu/GPU_material.h 
b/source/blender/gpu/GPU_material.h
index 505665b6f1f..2e102838b3d 100644
--- a/source/blender/gpu/GPU_material.h
+++ b/source/blender/gpu/GPU_material.h
@@ -259,7 +259,7 @@ struct GPUPass *GPU_material_get_pass(GPUMaterial 
*material);
 struct ListBase *GPU_material_get_inputs(GPUMaterial *material);
 GPUMaterialStatus GPU_material_status(GPUMaterial *mat);
 
-struct GPUUniformBuffer *GPU_material_get_uniform_buffer(GPUMaterial 
*material);
+struct GPUUniformBuffer *GPU_material_uniform_buffer_get(GPUMaterial 
*material);
 void GPU_material_uniform_buffer_create(GPUMaterial *material, ListBase 
*inputs);
 
 void GPU_material_vertex_attributes(GPUMaterial *material,
diff --git a/source/blender/gpu/intern/gpu_material.c 
b/source/blender/gpu/intern/gpu_material.c
index cb72c4c614f..212a6226118 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -200,7 +200,7 @@ ListBase *GPU_material_get_inputs(GPUMaterial *material)
        return &material->inputs;
 }
 
-GPUUniformBuffer *GPU_material_get_uniform_buffer(GPUMaterial *material)
+GPUUniformBuffer *GPU_material_uniform_buffer_get(GPUMaterial *material)
 {
        return material->ubo;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs