diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-25 21:23:16 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-25 21:23:16 +0300 |
| commit | 1e73c400a7b300dbbec58cd7f33c2970652ad23c (patch) | |
| tree | 1cb47f687af19e30113d3cbf857267653f86cbb5 /source/blender/gpu/intern | |
| parent | 7f8df735ae89b36086b3aa555ad50a656d1a4764 (diff) | |
| parent | 2cdcb1c1716180c00c23feb8332f17c2bab74864 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/makesrna/intern/rna_nodetree.c
Diffstat (limited to 'source/blender/gpu/intern')
| -rw-r--r-- | source/blender/gpu/intern/gpu_codegen.c | 4 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index 68e268cbc4f..944011879b5 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -184,8 +184,8 @@ static void gpu_parse_functions_string(GHash *hash, char *code) /* add parameter */ code = gpu_str_skip_token(code, NULL, 0); code = gpu_str_skip_token(code, NULL, 0); - function->paramqual[function->totparam]= qual; - function->paramtype[function->totparam]= type; + function->paramqual[function->totparam] = qual; + function->paramtype[function->totparam] = type; function->totparam++; } else { diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 44a3654109f..b757aff4bdb 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -773,7 +773,7 @@ GPUTexture *GPU_texture_from_preview(PreviewImage *prv, int mipmap) tex->refcount = 1; tex->target = GL_TEXTURE_2D; - prv->gputexture[0]= tex; + prv->gputexture[0] = tex; if (!glIsTexture(tex->bindcode)) { GPU_ASSERT_NO_GL_ERRORS("Blender Texture Not Loaded"); @@ -1953,7 +1953,7 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader) } if (retval == NULL) - printf("Unable to create a GPUShader for builtin shader: %d\n", shader); + printf("Unable to create a GPUShader for builtin shader: %u\n", shader); return retval; } @@ -1976,7 +1976,7 @@ GPUProgram *GPU_shader_get_builtin_program(GPUBuiltinProgram program) } if (retval == NULL) - printf("Unable to create a GPUProgram for builtin program: %d\n", program); + printf("Unable to create a GPUProgram for builtin program: %u\n", program); return retval; } |