[Bf-blender-cvs] [6e53b28898a] master: Cleanup: Move TransDataNla declaration to its TransData file

Germano Cavalcante noreply at git.blender.org
Mon Jun 8 13:28:52 CEST 2020


Commit: 6e53b28898a007793f32afbae339b66b4d4e615b
Author: Germano Cavalcante
Date:   Sun Jun 7 18:21:42 2020 -0300
Branches: master
https://developer.blender.org/rB6e53b28898a007793f32afbae339b66b4d4e615b

Cleanup: Move TransDataNla declaration to its TransData file

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

M	source/blender/editors/transform/transform.h
M	source/blender/editors/transform/transform_convert_nla.c

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

diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 2f3af015a1e..ff2126aac64 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -229,31 +229,6 @@ typedef struct TransDataSeq {
 
 } TransDataSeq;
 
-/** Used for NLA transform (stored in #TransData.extra pointer). */
-typedef struct TransDataNla {
-  /** ID-block NLA-data is attached to. */
-  ID *id;
-
-  /** Original NLA-Track that the strip belongs to. */
-  struct NlaTrack *oldTrack;
-  /** Current NLA-Track that the strip belongs to. */
-  struct NlaTrack *nlt;
-
-  /** NLA-strip this data represents. */
-  struct NlaStrip *strip;
-
-  /* dummy values for transform to write in - must have 3 elements... */
-  /** start handle. */
-  float h1[3];
-  /** end handle. */
-  float h2[3];
-
-  /** index of track that strip is currently in. */
-  int trackIndex;
-  /** handle-index: 0 for dummy entry, -1 for start, 1 for end, 2 for both ends. */
-  int handle;
-} TransDataNla;
-
 typedef struct TransData {
   /** Distance needed to affect element (for Proportionnal Editing). */
   float dist;
diff --git a/source/blender/editors/transform/transform_convert_nla.c b/source/blender/editors/transform/transform_convert_nla.c
index 1a38d01a81c..6ee2e191e69 100644
--- a/source/blender/editors/transform/transform_convert_nla.c
+++ b/source/blender/editors/transform/transform_convert_nla.c
@@ -41,6 +41,31 @@
 #include "transform.h"
 #include "transform_convert.h"
 
+/** Used for NLA transform (stored in #TransData.extra pointer). */
+typedef struct TransDataNla {
+  /** ID-block NLA-data is attached to. */
+  ID *id;
+
+  /** Original NLA-Track that the strip belongs to. */
+  struct NlaTrack *oldTrack;
+  /** Current NLA-Track that the strip belongs to. */
+  struct NlaTrack *nlt;
+
+  /** NLA-strip this data represents. */
+  struct NlaStrip *strip;
+
+  /* dummy values for transform to write in - must have 3 elements... */
+  /** start handle. */
+  float h1[3];
+  /** end handle. */
+  float h2[3];
+
+  /** index of track that strip is currently in. */
+  int trackIndex;
+  /** handle-index: 0 for dummy entry, -1 for start, 1 for end, 2 for both ends. */
+  int handle;
+} TransDataNla;
+
 /* -------------------------------------------------------------------- */
 /** \name NLA Transform Creation
  *



More information about the Bf-blender-cvs mailing list