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:
authorJason Wilkins <Jason.A.Wilkins@gmail.com>2014-07-04 20:39:33 +0400
committerJason Wilkins <Jason.A.Wilkins@gmail.com>2014-07-04 20:40:43 +0400
commitc39f6c49b7f2c164920a2c3af5436ba13ab28400 (patch)
tree4b0f077d0393077fa6cfa5ba5a35ace6832ad628
parent407a6dfdc9a10827a68cabc4e530f94b07893c70 (diff)
Made a mistake when rewriting GPU_material_construct_end to return bool.
-rw-r--r--source/blender/gpu/intern/gpu_material.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 5a20936e26f..9e89f6afd24 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -212,10 +212,10 @@ static bool GPU_material_construct_end(GPUMaterial *material)
&material->attribs, &material->builtins, material->ma->id.name);
if (!material->pass)
- return 0;
+ return false;
gpu_material_set_attrib_id(material);
-
+
shader = GPU_pass_shader(material->pass);
if (material->builtins & GPU_VIEW_MATRIX)
@@ -230,6 +230,8 @@ static bool GPU_material_construct_end(GPUMaterial *material)
material->obcolloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_OBCOLOR));
if (material->builtins & GPU_AUTO_BUMPSCALE)
material->obautobumpscaleloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_AUTO_BUMPSCALE));
+
+ return true;
}
else {
return false;