[Bf-blender-cvs] [e7367c607ef] master: Cleanup: Fix naming of a function

Sergey Sharybin noreply at git.blender.org
Mon Oct 14 11:04:40 CEST 2019


Commit: e7367c607ef4b93e6843eb69fbdea104888faf21
Author: Sergey Sharybin
Date:   Mon Oct 14 10:45:35 2019 +0200
Branches: master
https://developer.blender.org/rBe7367c607ef4b93e6843eb69fbdea104888faf21

Cleanup: Fix naming of a function

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

M	release/scripts/addons
M	source/blender/blenkernel/BKE_action.h
M	source/blender/blenkernel/intern/action.c
M	source/blender/blenkernel/intern/armature_update.c

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

diff --git a/release/scripts/addons b/release/scripts/addons
index 7a6516c3e98..0ec4a4fd2ac 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 7a6516c3e98ffa9cec21f490be733ee6d49a6424
+Subproject commit 0ec4a4fd2ac1a9a0aaf550ced7e4b445a340ca4e
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index 868c5a69593..b7139d5bbf6 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -212,8 +212,8 @@ void what_does_obaction(struct Object *ob,
                         float cframe);
 
 /* for proxy */
-void BKE_pose_copyesult_pchan_result(struct bPoseChannel *pchanto,
-                                     const struct bPoseChannel *pchanfrom);
+void BKE_pose_copy_pchan_result(struct bPoseChannel *pchanto,
+                                const struct bPoseChannel *pchanfrom);
 bool BKE_pose_copy_result(struct bPose *to, struct bPose *from);
 /* clear all transforms */
 void BKE_pose_rest(struct bPose *pose);
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index d072a0aa599..de1cbd236fb 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -1472,7 +1472,7 @@ void BKE_pose_rest(bPose *pose)
   }
 }
 
-void BKE_pose_copyesult_pchan_result(bPoseChannel *pchanto, const bPoseChannel *pchanfrom)
+void BKE_pose_copy_pchan_result(bPoseChannel *pchanto, const bPoseChannel *pchanfrom)
 {
   copy_m4_m4(pchanto->pose_mat, pchanfrom->pose_mat);
   copy_m4_m4(pchanto->chan_mat, pchanfrom->chan_mat);
@@ -1523,7 +1523,7 @@ bool BKE_pose_copy_result(bPose *to, bPose *from)
   for (pchanfrom = from->chanbase.first; pchanfrom; pchanfrom = pchanfrom->next) {
     pchanto = BKE_pose_channel_find_name(to, pchanfrom->name);
     if (pchanto != NULL) {
-      BKE_pose_copyesult_pchan_result(pchanto, pchanfrom);
+      BKE_pose_copy_pchan_result(pchanto, pchanfrom);
     }
   }
   return true;
diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c
index b4f5b1e2ec4..b6a2efb37b8 100644
--- a/source/blender/blenkernel/intern/armature_update.c
+++ b/source/blender/blenkernel/intern/armature_update.c
@@ -909,7 +909,7 @@ void BKE_pose_eval_proxy_copy_bone(struct Depsgraph *depsgraph, Object *object,
         pchan->name);
     return;
   }
-  BKE_pose_copyesult_pchan_result(pchan, pchan_from);
+  BKE_pose_copy_pchan_result(pchan, pchan_from);
   copy_dq_dq(&pchan->runtime.deform_dual_quat, &pchan_from->runtime.deform_dual_quat);
   BKE_pchan_bbone_segments_cache_copy(pchan, pchan_from);
 }



More information about the Bf-blender-cvs mailing list