[Bf-blender-cvs] [a676b2b4b4d] master: Multires: Cleanup, more clear naming

[Sergey Sharybin]

Commit: a676b2b4b4dcd0b6ea1ee352ea8f895809c99153
Author: Sergey Sharybin
Date:   Thu Jan 17 10:41:40 2019 +0100
Branches: master
https://developer.blender.org/rBa676b2b4b4dcd0b6ea1ee352ea8f895809c99153

Multires: Cleanup, more clear naming

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

M	source/blender/blenkernel/BKE_subdiv.h
M	source/blender/blenkernel/intern/subdiv_inline.h

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

diff --git a/source/blender/blenkernel/BKE_subdiv.h b/source/blender/blenkernel/BKE_subdiv.h
index 302616e4867..08f3921228b 100644
--- a/source/blender/blenkernel/BKE_subdiv.h
+++ b/source/blender/blenkernel/BKE_subdiv.h
@@ -256,8 +256,8 @@ BLI_INLINE int BKE_subdiv_grid_size_from_level(const int level);
  *
  * NOTE: Output coordinates are in ptex coordinates. */
 BLI_INLINE int BKE_subdiv_rotate_quad_to_corner(
-        const float u, const float v,
-        float *r_u, float *r_v);
+        const float quad_u, const float quad_v,
+        float *r_corner_u, float *r_corner_v);
 
 #include "intern/subdiv_inline.h"
 
diff --git a/source/blender/blenkernel/intern/subdiv_inline.h b/source/blender/blenkernel/intern/subdiv_inline.h
index 7eebde48bdc..6e3d906f08c 100644
--- a/source/blender/blenkernel/intern/subdiv_inline.h
+++ b/source/blender/blenkernel/intern/subdiv_inline.h
@@ -49,30 +49,30 @@ BLI_INLINE int BKE_subdiv_grid_size_from_level(const int level)
 }
 
 BLI_INLINE int BKE_subdiv_rotate_quad_to_corner(
-        const float u, const float v,
-        float *r_u, float *r_v)
+        const float quad_u, const float quad_v,
+        float *r_corner_u, float *r_corner_v)
 {
 	int corner;
-	if (u <= 0.5f && v <= 0.5f) {
+	if (quad_u <= 0.5f && quad_v <= 0.5f) {
 		corner = 0;
-		*r_u = 2.0f * u;
-		*r_v = 2.0f * v;
+		*r_corner_u = 2.0f * quad_u;
+		*r_corner_v = 2.0f * quad_v;
 	}
-	else if (u > 0.5f  && v <= 0.5f) {
+	else if (quad_u > 0.5f  && quad_v <= 0.5f) {
 		corner = 1;
-		*r_u = 2.0f * v;
-		*r_v = 2.0f * (1.0f - u);
+		*r_corner_u = 2.0f * quad_v;
+		*r_corner_v = 2.0f * (1.0f - quad_u);
 	}
-	else if (u > 0.5f  && v > 0.5f) {
+	else if (quad_u > 0.5f  && quad_v > 0.5f) {
 		corner = 2;
-		*r_u = 2.0f * (1.0f - u);
-		*r_v = 2.0f * (1.0f - v);
+		*r_corner_u = 2.0f * (1.0f - quad_u);
+		*r_corner_v = 2.0f * (1.0f - quad_v);
 	}
 	else {
-		BLI_assert(u <= 0.5f && v >= 0.5f);
+		BLI_assert(quad_u <= 0.5f && quad_v >= 0.5f);
 		corner = 3;
-		*r_u = 2.0f * (1.0f - v);
-		*r_v = 2.0f * u;
+		*r_corner_u = 2.0f * (1.0f - quad_v);
+		*r_corner_v = 2.0f * quad_u;
 	}
 	return corner;
 }