diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-11 08:48:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-11 08:50:23 +0300 |
commit | e215216958093790b0377d42567fd42c94942bef (patch) | |
tree | 08e4ef913fdd8059d0774cbd083d01b41bb5e594 /source/blender/blenkernel | |
parent | 43156d830470fbbcd89bc1bd4b1f32d3348ba7a9 (diff) |
Cleanup: use "_Runtime" suffix for DNA
Was done everywhere except bPoseChannel.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/action.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 5eb469d4b98..be77377e88e 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -794,7 +794,7 @@ void BKE_pose_channel_free_ex(bPoseChannel *pchan, bool do_id_user) /** Deallocates runtime cache of a pose channel's B-Bone shape. */ void BKE_pose_channel_free_bbone_cache(bPoseChannel *pchan) { - bPoseChannelRuntime *runtime = &pchan->runtime; + bPoseChannel_Runtime *runtime = &pchan->runtime; runtime->bbone_segments = 0; MEM_SAFE_FREE(runtime->bbone_rest_mats); diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index aca29c0349a..99474ce9bae 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -836,7 +836,7 @@ typedef struct ObjectBBoneDeform { static void allocate_bbone_cache(bPoseChannel *pchan, int segments) { - bPoseChannelRuntime *runtime = &pchan->runtime; + bPoseChannel_Runtime *runtime = &pchan->runtime; if (runtime->bbone_segments != segments) { if (runtime->bbone_segments != 0) { @@ -844,17 +844,17 @@ static void allocate_bbone_cache(bPoseChannel *pchan, int segments) } runtime->bbone_segments = segments; - runtime->bbone_rest_mats = MEM_malloc_arrayN(sizeof(Mat4), (uint)segments, "bPoseChannelRuntime::bbone_rest_mats"); - runtime->bbone_pose_mats = MEM_malloc_arrayN(sizeof(Mat4), (uint)segments, "bPoseChannelRuntime::bbone_pose_mats"); - runtime->bbone_deform_mats = MEM_malloc_arrayN(sizeof(Mat4), 1 + (uint)segments, "bPoseChannelRuntime::bbone_deform_mats"); - runtime->bbone_dual_quats = MEM_malloc_arrayN(sizeof(DualQuat), (uint)segments, "bPoseChannelRuntime::bbone_dual_quats"); + runtime->bbone_rest_mats = MEM_malloc_arrayN(sizeof(Mat4), (uint)segments, "bPoseChannel_Runtime::bbone_rest_mats"); + runtime->bbone_pose_mats = MEM_malloc_arrayN(sizeof(Mat4), (uint)segments, "bPoseChannel_Runtime::bbone_pose_mats"); + runtime->bbone_deform_mats = MEM_malloc_arrayN(sizeof(Mat4), 1 + (uint)segments, "bPoseChannel_Runtime::bbone_deform_mats"); + runtime->bbone_dual_quats = MEM_malloc_arrayN(sizeof(DualQuat), (uint)segments, "bPoseChannel_Runtime::bbone_dual_quats"); } } /** Compute and cache the B-Bone shape in the channel runtime struct. */ void BKE_pchan_bbone_segments_cache_compute(bPoseChannel *pchan) { - bPoseChannelRuntime *runtime = &pchan->runtime; + bPoseChannel_Runtime *runtime = &pchan->runtime; Bone *bone = pchan->bone; int segments = bone->segments; @@ -897,8 +897,8 @@ void BKE_pchan_bbone_segments_cache_compute(bPoseChannel *pchan) /** Copy cached B-Bone segments from one channel to another */ void BKE_pchan_bbone_segments_cache_copy(bPoseChannel *pchan, bPoseChannel *pchan_from) { - bPoseChannelRuntime *runtime = &pchan->runtime; - bPoseChannelRuntime *runtime_from = &pchan_from->runtime; + bPoseChannel_Runtime *runtime = &pchan->runtime; + bPoseChannel_Runtime *runtime_from = &pchan_from->runtime; int segments = runtime_from->bbone_segments; if (segments <= 1) { |