Merge branch 'master' into blender2.8
This commit is contained in:
commit
402486ea7b
|
@ -55,7 +55,6 @@
|
|||
|
||||
#include "physics_intern.h"
|
||||
|
||||
|
||||
static void free_PTCacheUndo(PTCacheUndo *undo)
|
||||
{
|
||||
PTCacheEditPoint *point;
|
||||
|
|
|
@ -69,27 +69,10 @@
|
|||
|
||||
#include "UI_resources.h"
|
||||
|
||||
#include "particle_edit_utildefines.h"
|
||||
|
||||
#include "physics_intern.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
|
||||
|
||||
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}};
|
||||
|
||||
/********************** particle system slot operators *********************/
|
||||
|
|
Loading…
Reference in New Issue