diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-12 19:26:19 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-12 19:26:19 +0300 |
commit | cf6cb3dcaf17f274ae8b6c151b8590611ae8c6c4 (patch) | |
tree | 8d20153c0955dcd14d0ae153ef84eef9342029ef /source/blender/makesrna/intern/rna_texture.c | |
parent | bcd12bf64d89165385ab4782bc05d7758fde734e (diff) |
Removed most particle system code from RNA.
Diffstat (limited to 'source/blender/makesrna/intern/rna_texture.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index ad1ca12d4ea..d6762495499 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -35,7 +35,6 @@ #include "DNA_texture_types.h" #include "DNA_world_types.h" #include "DNA_node_types.h" -#include "DNA_particle_types.h" #include "DNA_scene_types.h" /* MAXFRAME only */ #include "BLI_utildefines.h" @@ -249,20 +248,6 @@ void rna_TextureSlot_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRN case ID_LS: WM_main_add_notifier(NC_LINESTYLE, id); break; - case ID_PA: - { - MTex *mtex = ptr->data; - int recalc = OB_RECALC_DATA; - - if (mtex->mapto & PAMAP_INIT) - recalc |= PSYS_RECALC_RESET; - if (mtex->mapto & PAMAP_CHILD) - recalc |= PSYS_RECALC_CHILD; - - DAG_id_tag_update(id, recalc); - WM_main_add_notifier(NC_OBJECT | ND_PARTICLE | NA_EDITED, NULL); - break; - } } } @@ -450,29 +435,6 @@ static void rna_Envmap_update_generic(Main *bmain, Scene *scene, PointerRNA *ptr rna_Texture_update(bmain, scene, ptr); } -static PointerRNA rna_PointDensity_psys_get(PointerRNA *ptr) -{ - PointDensity *pd = ptr->data; - Object *ob = pd->object; - ParticleSystem *psys = NULL; - PointerRNA value; - - if (ob && pd->psys) - psys = BLI_findlink(&ob->particlesystem, pd->psys - 1); - - RNA_pointer_create(&ob->id, &RNA_ParticleSystem, psys, &value); - return value; -} - -static void rna_PointDensity_psys_set(PointerRNA *ptr, PointerRNA value) -{ - PointDensity *pd = ptr->data; - Object *ob = pd->object; - - if (ob && value.id.data == ob) - pd->psys = BLI_findindex(&ob->particlesystem, value.data) + 1; -} - static char *rna_PointDensity_path(PointerRNA *UNUSED(ptr)) { return BLI_sprintfN("point_density"); @@ -1713,13 +1675,6 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop = RNA_def_property(srna, "particle_system", PROP_POINTER, PROP_NONE); - RNA_def_property_ui_text(prop, "Particle System", "Particle System to render as points"); - RNA_def_property_struct_type(prop, "ParticleSystem"); - RNA_def_property_pointer_funcs(prop, "rna_PointDensity_psys_get", "rna_PointDensity_psys_set", NULL, NULL); - RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop = RNA_def_property(srna, "particle_cache_space", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "psys_cache_space"); RNA_def_property_enum_items(prop, particle_cache_items); |