Revert "Particle system: Move runtime data to runtime field"

This reverts commit 36faf739a71624b6ca10cec7233779f9eeace0bd.

Somewhat annoying but this change had some unforeseen consequences,
which lead to an actual bug.

Since this change was not sufficient to get original report fixed
is easier to simply revert for now.

Fixes T65842: Hair disappears when clicking on particle system name

1 files changed, 5 insertions, 12 deletions

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 0d87ae09943..a81bff60146 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -882,24 +882,17 @@ enum {
   MOD_MDEF_SURFACE = 1,
 };
 
-/* Is stored in ModifierData.runtime. */
-#
-#
-typedef struct ParticleSystemModifierDataRuntime {
+typedef struct ParticleSystemModifierData {
+  ModifierData modifier;
+
+  struct ParticleSystem *psys;
   /** Final Mesh - its topology may differ from orig mesh. */
   struct Mesh *mesh_final;
   /** Original mesh that particles are attached to. */
   struct Mesh *mesh_original;
   int totdmvert, totdmedge, totdmface;
-} ParticleSystemModifierDataRuntime;
-
-typedef struct ParticleSystemModifierData {
-  ModifierData modifier;
-
-  struct ParticleSystem *psys;
-  void *_pad1;
   short flag;
-  char _pad[6];
+  char _pad[2];
 } ParticleSystemModifierData;
 
 typedef enum {