Cleanup: use utility header for particle looping
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 Mar 2018 17:16:27 +0000 (18:16 +0100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 Mar 2018 17:18:04 +0000 (18:18 +0100)
source/blender/editors/physics/particle_edit_undo.c
source/blender/editors/physics/particle_object.c

index 3899d44..288e59a 100644 (file)
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 
-
 #include "ED_particle.h"
 
-
-
-
 #include "particle_edit_utildefines.h"
 
 #include "physics_intern.h"
index b3e166a..d85720f 100644 (file)
 
 #include "UI_resources.h"
 
-#include "physics_intern.h"
+#include "particle_edit_utildefines.h"
 
-#define KEY_K                                  PTCacheEditKey *key; int k
-#define POINT_P                                        PTCacheEditPoint *point; int p
-#define LOOP_POINTS                            for (p=0, point=edit->points; p<edit->totpoint; p++, point++)
-#if 0
-#define LOOP_VISIBLE_POINTS            for (p=0, point=edit->points; p<edit->totpoint; p++, point++) if (!(point->flag & PEP_HIDE))
-#define LOOP_SELECTED_POINTS   for (p=0, point=edit->points; p<edit->totpoint; p++, point++) if (point_is_selected(point))
-#define LOOP_UNSELECTED_POINTS for (p=0, point=edit->points; p<edit->totpoint; p++, point++) if (!point_is_selected(point))
-#define LOOP_EDITED_POINTS             for (p=0, point=edit->points; p<edit->totpoint; p++, point++) if (point->flag & PEP_EDIT_RECALC)
-#define LOOP_TAGGED_POINTS             for (p=0, point=edit->points; p<edit->totpoint; p++, point++) if (point->flag & PEP_TAG)
-#endif
-#define LOOP_KEYS                              for (k=0, key=point->keys; k<point->totkey; k++, key++)
-#if 0
-#define LOOP_VISIBLE_KEYS              for (k=0, key=point->keys; k<point->totkey; k++, key++) if (!(key->flag & PEK_HIDE))
-#define LOOP_SELECTED_KEYS             for (k=0, key=point->keys; k<point->totkey; k++, key++) if ((key->flag & PEK_SELECT) && !(key->flag & PEK_HIDE))
-#define LOOP_TAGGED_KEYS               for (k=0, key=point->keys; k<point->totkey; k++, key++) if (key->flag & PEK_TAG)
-
-#define KEY_WCO                                        (key->flag & PEK_USE_WCO ? key->world_co : key->co)
-#endif
+#include "physics_intern.h"
 
 static float I[4][4] = {{1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 1.0f}};