Commit: 5331581ea4cd382ce0c133a99bf50c0aea257aac
Author: Joshua Leung
Date:   Thu Mar 8 17:14:46 2018 +1300
Branches: master
https://developer.blender.org/rB5331581ea4cd382ce0c133a99bf50c0aea257aac

Cleanup: Use BKE_ prefix for all public functions exposed by the NLA module

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

M       source/blender/blenkernel/BKE_nla.h
M       source/blender/blenkernel/intern/anim_sys.c
M       source/blender/blenkernel/intern/ipo.c
M       source/blender/blenkernel/intern/nla.c
M       source/blender/editors/object/object_add.c
M       source/blender/editors/object/object_edit.c
M       source/blender/editors/space_action/action_data.c
M       source/blender/editors/space_nla/nla_channels.c
M       source/blender/editors/space_nla/nla_edit.c
M       source/blender/editors/transform/transform_generics.c
M       source/blender/makesrna/intern/rna_animation.c
M       source/blender/makesrna/intern/rna_nla.c

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

diff --git a/source/blender/blenkernel/BKE_nla.h 
b/source/blender/blenkernel/BKE_nla.h
index 8d9fc8ff6cf..4509d374b02 100644
--- a/source/blender/blenkernel/BKE_nla.h
+++ b/source/blender/blenkernel/BKE_nla.h
@@ -46,18 +46,18 @@ struct PropertyRNA;
 /* ----------------------------- */
 /* Data Management */
 
-void free_nlastrip(ListBase *strips, struct NlaStrip *strip);
-void free_nlatrack(ListBase *tracks, struct NlaTrack *nlt);
-void free_nladata(ListBase *tracks);
-
-struct NlaStrip *copy_nlastrip(struct NlaStrip *strip, const bool 
use_same_action);
-struct NlaTrack *copy_nlatrack(struct NlaTrack *nlt, const bool 
use_same_actions);
-void copy_nladata(ListBase *dst, ListBase *src);
-
-struct NlaTrack *add_nlatrack(struct AnimData *adt, struct NlaTrack *prev);
-struct NlaStrip *add_nlastrip(struct bAction *act);
-struct NlaStrip *add_nlastrip_to_stack(struct AnimData *adt, struct bAction 
*act);
-struct NlaStrip *add_nla_soundstrip(struct Scene *scene, struct Speaker *spk);
+void BKE_nlastrip_free(ListBase *strips, struct NlaStrip *strip);
+void BKE_nlatrack_free(ListBase *tracks, struct NlaTrack *nlt);
+void BKE_nla_tracks_free(ListBase *tracks);
+
+struct NlaStrip *BKE_nlastrip_copy(struct NlaStrip *strip, const bool 
use_same_action);
+struct NlaTrack *BKE_nlatrack_copy(struct NlaTrack *nlt, const bool 
use_same_actions);
+void BKE_nla_tracks_copy(ListBase *dst, ListBase *src);
+
+struct NlaTrack *BKE_nlatrack_add(struct AnimData *adt, struct NlaTrack *prev);
+struct NlaStrip *BKE_nlastrip_new(struct bAction *act);
+struct NlaStrip *BKE_nlastack_add_strip(struct AnimData *adt, struct bAction 
*act);
+struct NlaStrip *BKE_nla_add_soundstrip(struct Scene *scene, struct Speaker 
*spk);
 
 /* ----------------------------- */
 /* API */
diff --git a/source/blender/blenkernel/intern/anim_sys.c 
b/source/blender/blenkernel/intern/anim_sys.c
index 95d9a769749..095ef6fa1bd 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -243,7 +243,7 @@ void BKE_animdata_free(ID *id, const bool do_id_user)
                        }
                                
                        /* free nla data */
-                       free_nladata(&adt->nla_tracks);
+                       BKE_nla_tracks_free(&adt->nla_tracks);
                        
                        /* free drivers - stored as a list of F-Curves */
                        free_fcurves(&adt->drivers);
@@ -282,7 +282,7 @@ AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, 
const bool do_action)
        }
 
        /* duplicate NLA data */
-       copy_nladata(&dadt->nla_tracks, &adt->nla_tracks);
+       BKE_nla_tracks_copy(&dadt->nla_tracks, &adt->nla_tracks);
        
        /* duplicate drivers (F-Curves) */
        copy_fcurves(&dadt->drivers, &adt->drivers);
@@ -364,7 +364,7 @@ void BKE_animdata_merge_copy(ID *dst_id, ID *src_id, 
eAnimData_MergeCopy_Modes a
        if (src->nla_tracks.first) {
                ListBase tracks = {NULL, NULL};
                
-               copy_nladata(&tracks, &src->nla_tracks);
+               BKE_nla_tracks_copy(&tracks, &src->nla_tracks);
                BLI_movelisttolist(&dst->nla_tracks, &tracks);
        }
        
diff --git a/source/blender/blenkernel/intern/ipo.c 
b/source/blender/blenkernel/intern/ipo.c
index 00cf40f06cd..fcbc25ebad5 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -1663,7 +1663,7 @@ static void nlastrips_to_animdata(ID *id, ListBase 
*strips)
                                /* trying to add to the current failed (no 
space), 
                                 * so add a new track to the stack, and add to 
that...
                                 */
-                               nlt = add_nlatrack(adt, NULL);
+                               nlt = BKE_nlatrack_add(adt, NULL);
                                BKE_nlatrack_add_strip(nlt, strip);
                        }
                        
diff --git a/source/blender/blenkernel/intern/nla.c 
b/source/blender/blenkernel/intern/nla.c
index 6a0effd5ed2..e239037df70 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -75,7 +75,7 @@
 /* Remove the given NLA strip from the NLA track it occupies, free the strip's 
data,
  * and the strip itself. 
  */
-void free_nlastrip(ListBase *strips, NlaStrip *strip)
+void BKE_nlastrip_free(ListBase *strips, NlaStrip *strip)
 {
        NlaStrip *cs, *csn;
        
@@ -86,7 +86,7 @@ void free_nlastrip(ListBase *strips, NlaStrip *strip)
        /* free child-strips */
        for (cs = strip->strips.first; cs; cs = csn) {
                csn = cs->next;
-               free_nlastrip(&strip->strips, cs);
+               BKE_nlastrip_free(&strip->strips, cs);
        }
                
        /* remove reference to action */
@@ -113,7 +113,7 @@ void free_nlastrip(ListBase *strips, NlaStrip *strip)
 /* Remove the given NLA track from the set of NLA tracks, free the track's 
data,
  * and the track itself.
  */
-void free_nlatrack(ListBase *tracks, NlaTrack *nlt)
+void BKE_nlatrack_free(ListBase *tracks, NlaTrack *nlt)
 {
        NlaStrip *strip, *stripn;
        
@@ -124,7 +124,7 @@ void free_nlatrack(ListBase *tracks, NlaTrack *nlt)
        /* free strips */
        for (strip = nlt->strips.first; strip; strip = stripn) {
                stripn = strip->next;
-               free_nlastrip(&nlt->strips, strip);
+               BKE_nlastrip_free(&nlt->strips, strip);
        }
        
        /* free NLA track itself now */
@@ -137,7 +137,7 @@ void free_nlatrack(ListBase *tracks, NlaTrack *nlt)
 /* Free the elements of type NLA Tracks provided in the given list, but do not 
free
  * the list itself since that is not free-standing
  */
-void free_nladata(ListBase *tracks)
+void BKE_nla_tracks_free(ListBase *tracks)
 {
        NlaTrack *nlt, *nltn;
        
@@ -148,7 +148,7 @@ void free_nladata(ListBase *tracks)
        /* free tracks one by one */
        for (nlt = tracks->first; nlt; nlt = nltn) {
                nltn = nlt->next;
-               free_nlatrack(tracks, nlt);
+               BKE_nlatrack_free(tracks, nlt);
        }
        
        /* clear the list's pointers to be safe */
@@ -162,7 +162,7 @@ void free_nladata(ListBase *tracks)
  *
  * \param use_same_action When true, the existing action is used (instead of 
being duplicated)
  */
-NlaStrip *copy_nlastrip(NlaStrip *strip, const bool use_same_action)
+NlaStrip *BKE_nlastrip_copy(NlaStrip *strip, const bool use_same_action)
 {
        NlaStrip *strip_d;
        NlaStrip *cs, *cs_d;
@@ -195,7 +195,7 @@ NlaStrip *copy_nlastrip(NlaStrip *strip, const bool 
use_same_action)
        BLI_listbase_clear(&strip_d->strips);
        
        for (cs = strip->strips.first; cs; cs = cs->next) {
-               cs_d = copy_nlastrip(cs, use_same_action);
+               cs_d = BKE_nlastrip_copy(cs, use_same_action);
                BLI_addtail(&strip_d->strips, cs_d);
        }
        
@@ -204,7 +204,7 @@ NlaStrip *copy_nlastrip(NlaStrip *strip, const bool 
use_same_action)
 }
 
 /* Copy NLA Track */
-NlaTrack *copy_nlatrack(NlaTrack *nlt, const bool use_same_actions)
+NlaTrack *BKE_nlatrack_copy(NlaTrack *nlt, const bool use_same_actions)
 {
        NlaStrip *strip, *strip_d;
        NlaTrack *nlt_d;
@@ -221,7 +221,7 @@ NlaTrack *copy_nlatrack(NlaTrack *nlt, const bool 
use_same_actions)
        BLI_listbase_clear(&nlt_d->strips);
        
        for (strip = nlt->strips.first; strip; strip = strip->next) {
-               strip_d = copy_nlastrip(strip, use_same_actions);
+               strip_d = BKE_nlastrip_copy(strip, use_same_actions);
                BLI_addtail(&nlt_d->strips, strip_d);
        }
        
@@ -230,7 +230,7 @@ NlaTrack *copy_nlatrack(NlaTrack *nlt, const bool 
use_same_actions)
 }
 
 /* Copy all NLA data */
-void copy_nladata(ListBase *dst, ListBase *src)
+void BKE_nla_tracks_copy(ListBase *dst, ListBase *src)
 {
        NlaTrack *nlt, *nlt_d;
        
@@ -245,7 +245,7 @@ void copy_nladata(ListBase *dst, ListBase *src)
        for (nlt = src->first; nlt; nlt = nlt->next) {
                /* make a copy, and add the copy to the destination list */
                // XXX: we need to fix this sometime
-               nlt_d = copy_nlatrack(nlt, true);
+               nlt_d = BKE_nlatrack_copy(nlt, true);
                BLI_addtail(dst, nlt_d);
        }
 }
@@ -255,7 +255,7 @@ void copy_nladata(ListBase *dst, ListBase *src)
 /* Add a NLA Track to the given AnimData 
  *     - prev: NLA-Track to add the new one after
  */
-NlaTrack *add_nlatrack(AnimData *adt, NlaTrack *prev)
+NlaTrack *BKE_nlatrack_add(AnimData *adt, NlaTrack *prev)
 {
        NlaTrack *nlt;
        
@@ -285,8 +285,8 @@ NlaTrack *add_nlatrack(AnimData *adt, NlaTrack *prev)
        return nlt;
 }
 
-/* Add a NLA Strip referencing the given Action */
-NlaStrip *add_nlastrip(bAction *act)
+/* Create a NLA Strip referencing the given Action */
+NlaStrip *BKE_nlastrip_new(bAction *act)
 {
        NlaStrip *strip;
        
@@ -327,7 +327,7 @@ NlaStrip *add_nlastrip(bAction *act)
 }
 
 /* Add new NLA-strip to the top of the NLA stack - i.e. into the last track if 
space, or a new one otherwise */
-NlaStrip *add_nlastrip_to_stack(AnimData *adt, bAction *act)
+NlaStrip *BKE_nlastack_add_strip(AnimData *adt, bAction *act)
 {
        NlaStrip *strip;
        NlaTrack *nlt;
@@ -337,7 +337,7 @@ NlaStrip *add_nlastrip_to_stack(AnimData *adt, bAction *act)
                return NULL;
        
        /* create a new NLA strip */
-       strip = add_nlastrip(act);
+       strip = BKE_nlastrip_new(act);
        if (strip == NULL)
                return NULL;
        
@@ -346,7 +346,7 @@ NlaStrip *add_nlastrip_to_stack(AnimData *adt, bAction *act)
                /* trying to add to the last track failed (no track or no 
space), 
                 * so add a new track to the stack, and add to that...
                 */
-               nlt = add_nlatrack(adt, NULL);
+               nlt = BKE_nlatrack_add(adt, NULL);
                BKE_nlatrack_add_strip(nlt, strip);
        }
        
@@ -358,7 +358,7 @@ NlaStrip *add_nlastrip_to_stack(AnimData *adt, bAction *act)
 }
 
 /* Add a NLA Strip referencing the given speaker's sound */
-NlaStrip *add_nla_soundstrip(Scene *scene, Speaker *speaker)
+NlaStrip *BKE_nla_add_soundstrip(Scene *scene, Speaker *speaker)
 {
        NlaStrip *strip = MEM_callocN(sizeof(NlaStrip), "NlaSoundStrip");
        
@@ -751,7 +751,7 @@ void BKE_nlastrips_clear_metastrip(ListBase *strips, 
NlaStrip *strip)
        }
        
        /* free the meta-strip now */
-       free_nlastrip(strips, strip);
+       BKE_nlastrip_free(strips, strip);
 }
 
 /* Remove meta-strips (i.e. flatten the list of strips) from the top-level of 
the list of strips
@@ -1714,7 +1714,7 @@ bool BKE_nla_action_stash(AnimData *adt)
                }
        }
        
-       nlt = add_nlatrack(adt, prev_track);
+       nlt = BKE_nlatrack_add(adt, prev_track);
        BLI_assert(nlt != NULL);
        
        /* we need to ensure that if there wasn't any previous instance, it 
must go to tbe bottom of the stack */
@@ -1729,7 +1729,7 @@ bool BKE_nla_action_stash(AnimData *adt)
        /* add the action as a strip in this new track
         * NOTE: a new user is created here
         */
-       strip = add_nlastrip(adt->action);
+       strip = BKE_nlastrip_new(adt->action);
        BLI_assert(strip != NULL);
        
        BKE_nlatrack_add_strip(nlt, strip);
@@ -1782,7 +1782,7 @@ void BKE_nla_action_

@@ Diff output truncated at 10240 characters. @@

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to