Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

minor cleanup: spelling/wording

Browse Source
This commit is contained in:
Mike Erwin
2015-11-14 13:48:15 -05:00
parent f34cb5ab5a
commit f9e8de0b26
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/opensubdiv/opensubdiv_converter_capi.h
View File

@@ -93,7 +93,7 @@ OpenSubdiv_TopologyRefinerDescr *openSubdiv_createTopologyRefinerDescr(
void openSubdiv_deleteTopologyRefinerDescr( void openSubdiv_deleteTopologyRefinerDescr(
OpenSubdiv_TopologyRefinerDescr *topology_refiner); OpenSubdiv_TopologyRefinerDescr *topology_refiner);
/* TODO(sergey): Those calls are not strictly related on conversion. /* TODO(sergey): Those calls are not strictly related to conversion.
* needs some dedicated file perhaps. * needs some dedicated file perhaps.
*/ */

10
intern/opensubdiv/opensubdiv_gpu_capi.cc
View File

@@ -312,7 +312,7 @@ void bindProgram(GLMeshInterface * /*mesh*/,
{ {
glUseProgram(program); glUseProgram(program);
/* Matricies */ /* Matrices */
glUniformMatrix4fv(glGetUniformLocation(program, "modelViewMatrix"), glUniformMatrix4fv(glGetUniformLocation(program, "modelViewMatrix"),
1, false, 1, false,
g_transform.model_view_matrix); g_transform.model_view_matrix);
@@ -323,7 +323,7 @@ void bindProgram(GLMeshInterface * /*mesh*/,
1, false, 1, false,
g_transform.normal_matrix); g_transform.normal_matrix);
/* Ligthing */ /* Lighting */
glBindBuffer(GL_UNIFORM_BUFFER, g_lighting_ub); glBindBuffer(GL_UNIFORM_BUFFER, g_lighting_ub);
glBufferSubData(GL_UNIFORM_BUFFER, glBufferSubData(GL_UNIFORM_BUFFER,
0, sizeof(g_lighting_data), &g_lighting_data); 0, sizeof(g_lighting_data), &g_lighting_data);
@@ -427,7 +427,7 @@ void openSubdiv_osdGLMeshDisplayPrepare(int use_osd_glsl,
g_use_osd_glsl = use_osd_glsl != 0; g_use_osd_glsl = use_osd_glsl != 0;
g_active_uv_index = active_uv_index; g_active_uv_index = active_uv_index;
/* Update transformation matricies. */ /* Update transformation matrices. */
glGetFloatv(GL_PROJECTION_MATRIX, g_transform.projection_matrix); glGetFloatv(GL_PROJECTION_MATRIX, g_transform.projection_matrix);
glGetFloatv(GL_MODELVIEW_MATRIX, g_transform.model_view_matrix); glGetFloatv(GL_MODELVIEW_MATRIX, g_transform.model_view_matrix);
@@ -482,7 +482,7 @@ void openSubdiv_osdGLMeshDisplayPrepare(int use_osd_glsl,
} }
} }
static GLuint preapre_patchDraw(GLMeshInterface *mesh, static GLuint prepare_patchDraw(GLMeshInterface *mesh,
bool fill_quads) bool fill_quads)
{ {
GLint program = 0; GLint program = 0;
@@ -657,7 +657,7 @@ void openSubdiv_osdGLMeshDisplay(OpenSubdiv_GLMesh *gl_mesh,
} }
/* Setup GLSL/OpenGL to draw patches in current context. */ /* Setup GLSL/OpenGL to draw patches in current context. */
GLuint program = preapre_patchDraw(mesh, fill_quads != 0); GLuint program = prepare_patchDraw(mesh, fill_quads != 0);
if (start_patch != -1) { if (start_patch != -1) {
draw_partition_patches_range(mesh, draw_partition_patches_range(mesh,