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:
authorThomas Dinges <blender@dingto.org>2013-05-09 19:20:00 +0400
committerThomas Dinges <blender@dingto.org>2013-05-09 19:20:00 +0400
commitba55f2da64dad0b9cf3106d226fb0d105278e30c (patch)
tree2fe0d87f0949a113b8dc308810ea64706baccf22 /intern/cycles/render/mesh_displace.cpp
parent3451baf141c731f730960c5b6c951136532674f4 (diff)
Cycles:
* Change some if / else if conditions to switch / case.
Diffstat (limited to 'intern/cycles/render/mesh_displace.cpp')
-rw-r--r--intern/cycles/render/mesh_displace.cpp26
1 files changed, 14 insertions, 12 deletions
diff --git a/intern/cycles/render/mesh_displace.cpp b/intern/cycles/render/mesh_displace.cpp
index f20bc73a542..159705cbb6a 100644
--- a/intern/cycles/render/mesh_displace.cpp
+++ b/intern/cycles/render/mesh_displace.cpp
@@ -79,18 +79,20 @@ bool MeshManager::displace(Device *device, DeviceScene *dscene, Scene *scene, Me
int object = ~object_index;
int prim = mesh->tri_offset + i;
float u, v;
-
- if(j == 0) {
- u = 1.0f;
- v = 0.0f;
- }
- else if(j == 1) {
- u = 0.0f;
- v = 1.0f;
- }
- else {
- u = 0.0f;
- v = 0.0f;
+
+ switch (j) {
+ case 0:
+ u = 1.0f;
+ v = 0.0f;
+ break;
+ case 1:
+ u = 0.0f;
+ v = 1.0f;
+ break;
+ default:
+ u = 0.0f;
+ v = 0.0f;
+ break;
}
/* back */