[Bf-blender-cvs] [da800621ed2] blender2.8: Subdiv: CCG, cleanup

[Sergey Sharybin]

Commit: da800621ed2e65fdf5b6ad665a96b360a51e83fc
Author: Sergey Sharybin
Date:   Fri Sep 21 13:01:09 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBda800621ed2e65fdf5b6ad665a96b360a51e83fc

Subdiv: CCG, cleanup

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

M	source/blender/blenkernel/intern/subdiv_ccg.c

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

diff --git a/source/blender/blenkernel/intern/subdiv_ccg.c b/source/blender/blenkernel/intern/subdiv_ccg.c
index 5f142b9707e..29327a465b3 100644
--- a/source/blender/blenkernel/intern/subdiv_ccg.c
+++ b/source/blender/blenkernel/intern/subdiv_ccg.c
@@ -191,19 +191,21 @@ static void subdiv_ccg_eval_grid_element(
         const float u, const float v,
         unsigned char *element)
 {
-	if (data->subdiv->displacement_evaluator != NULL) {
+	Subdiv *subdiv = data->subdiv;
+	SubdivCCG *subdiv_ccg = data->subdiv_ccg;
+	if (subdiv->displacement_evaluator != NULL) {
 		BKE_subdiv_eval_final_point(
-		        data->subdiv, ptex_face_index, u, v, (float *)element);
+		        subdiv, ptex_face_index, u, v, (float *)element);
 	}
-	else if (data->subdiv_ccg->has_normal) {
+	else if (subdiv_ccg->has_normal) {
 		BKE_subdiv_eval_limit_point_and_normal(
-		        data->subdiv, ptex_face_index, u, v,
+		        subdiv, ptex_face_index, u, v,
 		        (float *)element,
-		        (float *)(element + data->subdiv_ccg->normal_offset));
+		        (float *)(element + subdiv_ccg->normal_offset));
 	}
 	else {
 		BKE_subdiv_eval_limit_point(
-		        data->subdiv, ptex_face_index, u, v, (float *)element);
+		        subdiv, ptex_face_index, u, v, (float *)element);
 	}
 }