From b8eca8e07d4e0c2061464b485f4c2e1e5d23d8cc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 19 Mar 2018 18:16:27 +0100 Subject: Cleanup: use utility header for particle looping --- source/blender/editors/physics/particle_edit_undo.c | 4 ---- source/blender/editors/physics/particle_object.c | 21 ++------------------- 2 files changed, 2 insertions(+), 23 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/physics/particle_edit_undo.c b/source/blender/editors/physics/particle_edit_undo.c index 3899d445b78..288e59a8671 100644 --- a/source/blender/editors/physics/particle_edit_undo.c +++ b/source/blender/editors/physics/particle_edit_undo.c @@ -48,12 +48,8 @@ #include "BKE_particle.h" #include "BKE_pointcache.h" - #include "ED_particle.h" - - - #include "particle_edit_utildefines.h" #include "physics_intern.h" diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index b3e166ad56a..d85720f956c 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -67,26 +67,9 @@ #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; ptotpoint; p++, point++) -#if 0 -#define LOOP_VISIBLE_POINTS for (p=0, point=edit->points; ptotpoint; p++, point++) if (!(point->flag & PEP_HIDE)) -#define LOOP_SELECTED_POINTS for (p=0, point=edit->points; ptotpoint; p++, point++) if (point_is_selected(point)) -#define LOOP_UNSELECTED_POINTS for (p=0, point=edit->points; ptotpoint; p++, point++) if (!point_is_selected(point)) -#define LOOP_EDITED_POINTS for (p=0, point=edit->points; ptotpoint; p++, point++) if (point->flag & PEP_EDIT_RECALC) -#define LOOP_TAGGED_POINTS for (p=0, point=edit->points; ptotpoint; p++, point++) if (point->flag & PEP_TAG) -#endif -#define LOOP_KEYS for (k=0, key=point->keys; ktotkey; k++, key++) -#if 0 -#define LOOP_VISIBLE_KEYS for (k=0, key=point->keys; ktotkey; k++, key++) if (!(key->flag & PEK_HIDE)) -#define LOOP_SELECTED_KEYS for (k=0, key=point->keys; ktotkey; k++, key++) if ((key->flag & PEK_SELECT) && !(key->flag & PEK_HIDE)) -#define LOOP_TAGGED_KEYS for (k=0, key=point->keys; ktotkey; 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}}; -- cgit v1.2.3