diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-21 14:01:09 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-21 16:31:43 +0300 |
commit | da800621ed2e65fdf5b6ad665a96b360a51e83fc (patch) | |
tree | 31c65fc46fef56d6e37b1adf4c73f92e63cf9f9a /source/blender/blenkernel/intern/subdiv_ccg.c | |
parent | 6a7914b73e543e3a09cdcd9a7563865a53a20c89 (diff) |
Subdiv: CCG, cleanup
Diffstat (limited to 'source/blender/blenkernel/intern/subdiv_ccg.c')
-rw-r--r-- | source/blender/blenkernel/intern/subdiv_ccg.c | 14 |
1 files changed, 8 insertions, 6 deletions
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); } } |