[Bf-blender-cvs] [c39f6c4] soc-2014-viewport_fx: Made a mistake when rewriting GPU_material_construct_end to return bool.

[Jason Wilkins]

Commit: c39f6c49b7f2c164920a2c3af5436ba13ab28400
Author: Jason Wilkins
Date:   Fri Jul 4 11:39:33 2014 -0500
https://developer.blender.org/rBc39f6c49b7f2c164920a2c3af5436ba13ab28400

Made a mistake when rewriting GPU_material_construct_end to return bool.

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

M       source/blender/gpu/intern/gpu_material.c

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

diff --git a/source/blender/gpu/intern/gpu_material.c 
b/source/blender/gpu/intern/gpu_material.c
index 5a20936..9e89f6a 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;

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