Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2016-04-16 12:29:28 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2016-04-16 12:29:28 +0300
commitd30b942f07f66ec0479fcfb1ab42ee0a66e85869 (patch)
tree59128202d84154612a381df62b73b3d7913a1e99 /source/blender/blenkernel/intern
parentdf2e543d4431c1d4f0003b5fbc4cf9ee98a2f7da (diff)
Removed the ID_PA code used for ParticleSettings.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r--source/blender/blenkernel/intern/anim_sys.c1
-rw-r--r--source/blender/blenkernel/intern/idcode.c3
-rw-r--r--source/blender/blenkernel/intern/ipo.c72
-rw-r--r--source/blender/blenkernel/intern/library.c5
4 files changed, 0 insertions, 81 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;