Removed the ID_PA code used for ParticleSettings.

14 files changed, 5 insertions, 131 deletions

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 41950c59a22..1f238153361 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -92,7 +92,6 @@ bool id_type_can_have_animdata(ID *id)
 		case ID_OB:
 		case ID_ME: case ID_MB: case ID_CU: case ID_AR: case ID_LT:
 		case ID_KE:
-		case ID_PA:
 		case ID_MA: case ID_TE: case ID_NT:
 		case ID_LA: case ID_CA: case ID_WO:
 		case ID_LS:
diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c
index 68a741bc3fc..b38b1838a2b 100644
--- a/source/blender/blenkernel/intern/idcode.c
+++ b/source/blender/blenkernel/intern/idcode.c
@@ -76,7 +76,6 @@ static IDType idtypes[] = {
 	{ ID_MSK,  "Mask",               "masks",           BLT_I18NCONTEXT_ID_MASK,               IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_NT,   "NodeTree",           "node_groups",     BLT_I18NCONTEXT_ID_NODETREE,           IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_OB,   "Object",             "objects",         BLT_I18NCONTEXT_ID_OBJECT,             IDTYPE_FLAGS_ISLINKABLE },
-	{ ID_PA,   "ParticleSettings",   "particles",       BLT_I18NCONTEXT_ID_PARTICLESETTINGS,   IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_PAL,  "Palettes",           "palettes",        BLT_I18NCONTEXT_ID_PALETTE,            IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_PC,   "PaintCurve",         "paint_curves",    BLT_I18NCONTEXT_ID_PAINTCURVE,         IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_SCE,  "Scene",              "scenes",          BLT_I18NCONTEXT_ID_SCENE,              IDTYPE_FLAGS_ISLINKABLE },
@@ -191,7 +190,6 @@ int BKE_idcode_to_idfilter(const short idcode)
 		CASE_IDFILTER(MSK);
 		CASE_IDFILTER(NT);
 		CASE_IDFILTER(OB);
-		CASE_IDFILTER(PA);
 		CASE_IDFILTER(PAL);
 		CASE_IDFILTER(PC);
 		CASE_IDFILTER(SCE);
@@ -234,7 +232,6 @@ short BKE_idcode_from_idfilter(const int idfilter)
 		CASE_IDFILTER(MSK);
 		CASE_IDFILTER(NT);
 		CASE_IDFILTER(OB);
-		CASE_IDFILTER(PA);
 		CASE_IDFILTER(PAL);
 		CASE_IDFILTER(PC);
 		CASE_IDFILTER(SCE);
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 730d5a93758..b7eb80cbe2a 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -739,74 +739,6 @@ static const char *world_adrcodes_to_paths(int adrcode, int *array_index)
 	return NULL;
 }
 
-/* Particle Types */
-static const char *particle_adrcodes_to_paths(int adrcode, int *array_index)
-{
-	/* set array index like this in-case nothing sets it correctly  */
-	*array_index = 0;
-	
-	/* result depends on adrcode */
-	switch (adrcode) {
-		case PART_CLUMP:
-			return "settings.clump_factor";
-		case PART_AVE:
-			return "settings.angular_velocity_factor";
-		case PART_SIZE:
-			return "settings.particle_size";
-		case PART_DRAG:
-			return "settings.drag_factor";
-		case PART_BROWN:
-			return "settings.brownian_factor";
-		case PART_DAMP:
-			return "settings.damp_factor";
-		case PART_LENGTH:
-			return "settings.length";
-		case PART_GRAV_X:
-			*array_index = 0; return "settings.acceleration";
-		case PART_GRAV_Y:
-			*array_index = 1; return "settings.acceleration";
-		case PART_GRAV_Z:
-			*array_index = 2; return "settings.acceleration";
-		case PART_KINK_AMP:
-			return "settings.kink_amplitude";
-		case PART_KINK_FREQ:
-			return "settings.kink_frequency";
-		case PART_KINK_SHAPE:
-			return "settings.kink_shape";
-		case PART_BB_TILT:
-			return "settings.billboard_tilt";
-		
-		/* PartDeflect needs to be sorted out properly in rna_object_force;
-		 * If anyone else works on this, but is unfamiliar, these particular
-		 * settings reference the particles of the system themselves
-		 * being used as forces -- it will use the same rna structure
-		 * as the similar object forces */
-#if 0
-		case PART_PD_FSTR:
-			if (part->pd) poin = &(part->pd->f_strength);
-			break;
-		case PART_PD_FFALL:
-			if (part->pd) poin = &(part->pd->f_power);
-			break;
-		case PART_PD_FMAXD:
-			if (part->pd) poin = &(part->pd->maxdist);
-			break;
-		case PART_PD2_FSTR:
-			if (part->pd2) poin = &(part->pd2->f_strength);
-			break;
-		case PART_PD2_FFALL:
-			if (part->pd2) poin = &(part->pd2->f_power);
-			break;
-		case PART_PD2_FMAXD:
-			if (part->pd2) poin = &(part->pd2->maxdist);
-			break;
-#endif
-
-	}
-
-	return NULL;
-}
-
 /* ------- */
 
 /* Allocate memory for RNA-path for some property given a blocktype, adrcode, and 'root' parts of path
@@ -872,10 +804,6 @@ static char *get_rna_access(ID *id, int blocktype, int adrcode, char actname[],
 			propname = world_adrcodes_to_paths(adrcode, &dummy_index);
 			break;
 		
-		case ID_PA: /* particle */
-			propname = particle_adrcodes_to_paths(adrcode, &dummy_index);
-			break;
-			
 		case ID_CU: /* curve */
 			/* this used to be a 'dummy' curve which got evaluated on the fly... 
 			 * now we've got real var for this!
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index be04b97bb47..153a6d1c4c5 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -567,8 +567,6 @@ ListBase *which_libbase(Main *mainlib, short type)
 			return &(mainlib->nodetree);
 		case ID_BR:
 			return &(mainlib->brush);
-		case ID_PA:
-			return &(mainlib->particle);
 		case ID_WM:
 			return &(mainlib->wm);
 		case ID_GD:
@@ -974,9 +972,6 @@ void BKE_libblock_init_empty(ID *id)
 		case ID_BR:
 			BKE_brush_init((Brush *)id);
 			break;
-		case ID_PA:
-			/* Nothing to do. */
-			break;
 		case ID_PC:
 			/* Nothing to do. */
 			break;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b535d91e77d..eb1b881f838 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7548,7 +7548,6 @@ static const char *dataname(short id_code)
 		case ID_SO: return "Data from SO";
 		case ID_NT: return "Data from NT";
 		case ID_BR: return "Data from BR";
-		case ID_PA: return "Data from PA";
 		case ID_PAL: return "Data from PAL";
 		case ID_PC: return "Data from PCRV";
 		case ID_GD: return "Data from GD";
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 8b30c598a3c..157aa4cf368 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -314,7 +314,7 @@ static short acf_generic_group_offset(bAnimContext *ac, bAnimListElem *ale)
 			offset += U.widget_unit;
 		}
 		/* materials and particles animdata */
-		else if (ELEM(GS(ale->id->name), ID_MA, ID_PA))
+		else if (GS(ale->id->name) == ID_MA)
 			offset += (short)(0.7f * U.widget_unit);
 			
 		/* if not in Action Editor mode, action-groups (and their children) must carry some offset too... */
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 7be153e942e..3682cff3908 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1485,8 +1485,6 @@ int UI_idcode_icon_get(const int idcode)
 			return ICON_NODETREE;
 		case ID_OB:
 			return ICON_OBJECT_DATA;
-		case ID_PA:
-			return ICON_PARTICLE_DATA;
 		case ID_PAL:
 			return ICON_COLOR;  /* TODO! this would need its own icon! */
 		case ID_PC:
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index ace70d6f9ac..4560c5384b7 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -359,7 +359,6 @@ static const char *template_id_browse_tip(StructRNA *type)
 			case ID_AC:  return N_("Browse Action to be linked");
 			case ID_NT:  return N_("Browse Node Tree to be linked");
 			case ID_BR:  return N_("Browse Brush to be linked");
-			case ID_PA:  return N_("Browse Particle Settings to be linked");
 			case ID_GD:  return N_("Browse Grease Pencil Data to be linked");
 			case ID_MC:  return N_("Browse Movie Clip to be linked");
 			case ID_MSK: return N_("Browse Mask to be linked");
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index 981b101519c..100329eddfc 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -212,7 +212,7 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 		params->filter_id = FILTER_ID_AC | FILTER_ID_AR | FILTER_ID_BR | FILTER_ID_CA | FILTER_ID_CU | FILTER_ID_GD |
 		                    FILTER_ID_GR | FILTER_ID_IM | FILTER_ID_LA | FILTER_ID_LS | FILTER_ID_LT | FILTER_ID_MA |
 		                    FILTER_ID_MB | FILTER_ID_MC | FILTER_ID_ME | FILTER_ID_MSK | FILTER_ID_NT | FILTER_ID_OB |
-		                    FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_SCE | FILTER_ID_SPK | FILTER_ID_SO |
+		                    FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_SCE | FILTER_ID_SPK | FILTER_ID_SO |
 		                    FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF | FILTER_ID_WO;
 
 		if (U.uiflag & USER_HIDE_DOT) {
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c
index ef1f68441d3..0c91a2eb1c6 100644
--- a/source/blender/editors/space_nla/nla_channels.c
+++ b/source/blender/editors/space_nla/nla_channels.c
@@ -213,7 +213,7 @@ static int mouse_nla_channels(bContext *C, bAnimContext *ac, float x, int channe
 			/* offset for start of channel (on LHS of channel-list) */
 			if (ale->id) {
 				/* special exception for materials and particles */
-				if (ELEM(GS(ale->id->name), ID_MA, ID_PA))
+				if (GS(ale->id->name) == ID_MA)
 					offset = 21 + NLACHANNEL_BUTTON_WIDTH;
 				else
 					offset = 14;
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 5db4897b36d..3249c3f3ab7 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -59,7 +59,7 @@ typedef struct TreeElement {
 
 #define TREESTORE_ID_TYPE(_id) \
 	(ELEM(GS((_id)->name), ID_SCE, ID_LI, ID_OB, ID_ME, ID_CU, ID_MB, ID_NT, ID_MA, ID_TE, ID_IM, ID_LT, ID_LA, ID_CA) || \
-	 ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC, ID_BR, ID_PA, ID_GD, ID_LS) || \
+	 ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC, ID_BR, ID_GD, ID_LS) || \
 	 ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO))  /* Only in 'blendfile' mode ... :/ */
 
 /* TreeElement->flag */
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 0bf3c350263..cb51e168ec2 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -238,7 +238,6 @@ typedef struct PreviewImage {
 #define ID_AC		MAKE_ID2('A', 'C') /* bAction */
 #define ID_NT		MAKE_ID2('N', 'T') /* bNodeTree */
 #define ID_BR		MAKE_ID2('B', 'R') /* Brush */
-#define ID_PA		MAKE_ID2('P', 'A') /* ParticleSettings */
 #define ID_GD		MAKE_ID2('G', 'D') /* bGPdata, (Grease Pencil) */
 #define ID_WM		MAKE_ID2('W', 'M') /* WindowManager */
 #define ID_MC		MAKE_ID2('M', 'C') /* MovieClip */
@@ -366,7 +365,6 @@ enum {
 	FILTER_ID_TXT       = (1 << 24),
 	FILTER_ID_VF        = (1 << 25),
 	FILTER_ID_WO        = (1 << 26),
-	FILTER_ID_PA        = (1 << 27),
 };
 
 #ifdef __cplusplus
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 374104d8b13..9e246075e7d 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -407,45 +407,6 @@ typedef struct Ipo {
 #define FLUIDSIM_VEL_FORCE_STR 		12
 #define FLUIDSIM_VEL_FORCE_RADIUS 	13
 
-/* ******************** */
-/* particle ipos */
-
-/* ******* Particle (ID_PA) ******** */
-#define PART_TOTIPO		25
-#define PART_TOTNAM		25
-
-#define PART_EMIT_FREQ	1
-/* #define PART_EMIT_LIFE	2 */ /*UNUSED*/
-#define PART_EMIT_VEL	3
-#define PART_EMIT_AVE	4
-/* #define PART_EMIT_SIZE	5 */ /*UNUSED*/
-
-#define PART_AVE		6
-#define PART_SIZE		7
-#define PART_DRAG		8
-#define PART_BROWN		9
-#define PART_DAMP		10
-#define PART_LENGTH		11
-#define PART_CLUMP		12
-
-#define PART_GRAV_X		13
-#define PART_GRAV_Y		14
-#define PART_GRAV_Z		15
-
-#define PART_KINK_AMP	16
-#define PART_KINK_FREQ	17
-#define PART_KINK_SHAPE	18
-
-#define PART_BB_TILT	19
-
-#define PART_PD_FSTR	20
-#define PART_PD_FFALL	21
-#define PART_PD_FMAXD	22
-
-#define PART_PD2_FSTR	23
-#define PART_PD2_FFALL	24
-#define PART_PD2_FMAXD	25
-
 
 /* -------------------- Defines: Flags and Types ------------------ */
 
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 1baef983484..c9f1b739660 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -3810,7 +3810,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna)
 	     "IMAGE", ICON_IMAGE_DATA, "Images & Sounds", "Show/hide images, movie clips, sounds and masks"},
 		{FILTER_ID_CA | FILTER_ID_LA | FILTER_ID_SPK | FILTER_ID_WO,
 	     "ENVIRONMENT", ICON_WORLD_DATA, "Environment", "Show/hide worlds, lamps, cameras and speakers"},
-		{FILTER_ID_BR | FILTER_ID_GD | FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_TXT | FILTER_ID_VF,
+		{FILTER_ID_BR | FILTER_ID_GD | FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_TXT | FILTER_ID_VF,
 	     "MISC", ICON_GREASEPENCIL, "Miscellaneous", "Show/hide other data types"},
 	    {0, NULL, 0, NULL, NULL}
 	};