[Bf-blender-cvs] [bdc94e5] temp-cycles-microdisplacement: Fix typo that got copied around
Mai Lavelle
noreply at git.blender.org
Tue Apr 12 18:46:07 CEST 2016
Commit: bdc94e57c3faa75f258c1bfcc24fb2d15dca9be5
Author: Mai Lavelle
Date: Tue Apr 12 05:58:41 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rBbdc94e57c3faa75f258c1bfcc24fb2d15dca9be5
Fix typo that got copied around
===================================================================
M intern/cycles/render/mesh.h
M intern/cycles/render/mesh_subdivision.cpp
===================================================================
diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h
index 67d21e1..ef697f9 100644
--- a/intern/cycles/render/mesh.h
+++ b/intern/cycles/render/mesh.h
@@ -112,7 +112,7 @@ public:
enum SubdivisionType {
SUBDIVISION_NONE,
SUBDIVISION_LINEAR,
- SUBDIVISION_CATMALL_CLARK,
+ SUBDIVISION_CATMULL_CLARK,
};
SubdivisionType subdivision_type;
diff --git a/intern/cycles/render/mesh_subdivision.cpp b/intern/cycles/render/mesh_subdivision.cpp
index 06aca14..a66645c 100644
--- a/intern/cycles/render/mesh_subdivision.cpp
+++ b/intern/cycles/render/mesh_subdivision.cpp
@@ -89,7 +89,7 @@ void Mesh::update_osd()
{
assert(!osd_data);
- if(subdivision_type != Mesh::SUBDIVISION_CATMALL_CLARK)
+ if(subdivision_type != Mesh::SUBDIVISION_CATMULL_CLARK)
return;
osd_data = new MeshOsdData;
@@ -331,7 +331,7 @@ void Mesh::dice_subpatch(TessellatedSubPatch* diced, int subpatch_id)
LinearTrianglePatch tri_patch;
ccl::Patch* subd_patch;
- if(subdivision_type == SUBDIVISION_CATMALL_CLARK) {
+ if(subdivision_type == SUBDIVISION_CATMULL_CLARK) {
osd_patch.mesh = this;
osd_patch.patch = subpatches[subpatch_id].patch;
@@ -430,7 +430,7 @@ void Mesh::split_patches(DiagSplit *split)
float3 *vN = attr_vN->data_float3();
for(int p = 0; p < patches.size(); p++) {
- if(subdivision_type == SUBDIVISION_CATMALL_CLARK) {
+ if(subdivision_type == SUBDIVISION_CATMULL_CLARK) {
OsdPatch patch;
patch.mesh = this;
patch.patch = p;
More information about the Bf-blender-cvs
mailing list