Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / anim_sys.c
index 99aae6239e8679388b1c43d185976551bb556f40..7e01b88fc3b714aa7b285aa72a3c563c11e3c0e8 100644 (file)
@@ -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:
@@ -1130,9 +1129,6 @@ void BKE_animdata_main_cb(Main *mainptr, ID_AnimData_Edit_Callback func, void *u
        /* meshes */
        ANIMDATA_IDS_CB(mainptr->mesh.first);
        
-       /* particles */
-       ANIMDATA_IDS_CB(mainptr->particle.first);
-
        /* speakers */
        ANIMDATA_IDS_CB(mainptr->speaker.first);
 
@@ -1223,9 +1219,6 @@ void BKE_animdata_fix_paths_rename_all(ID *ref_id, const char *prefix, const cha
        /* meshes */
        RENAMEFIX_ANIM_IDS(mainptr->mesh.first);
        
-       /* particles */
-       RENAMEFIX_ANIM_IDS(mainptr->particle.first);
-
        /* speakers */
        RENAMEFIX_ANIM_IDS(mainptr->speaker.first);
 
@@ -2809,9 +2802,6 @@ void BKE_animsys_evaluate_all_animation(Main *main, Scene *scene, float ctime)
        /* meshes */
        EVAL_ANIM_IDS(main->mesh.first, ADT_RECALC_ANIM);
        
-       /* particles */
-       EVAL_ANIM_IDS(main->particle.first, ADT_RECALC_ANIM);
-       
        /* speakers */
        EVAL_ANIM_IDS(main->speaker.first, ADT_RECALC_ANIM);