[Bf-blender-cvs] [15c8d09] temp_remove_particles: Removed the Main.particle list, used for ParticleSettings ID blocks.

Lukas Tönne noreply at git.blender.org
Sat Apr 16 12:40:24 CEST 2016


Commit: 15c8d095e5f5364ef4fb4cc7a8412fd9c5c2e9fa
Author: Lukas Tönne
Date:   Sat Apr 16 12:28:29 2016 +0200
Branches: temp_remove_particles
https://developer.blender.org/rB15c8d095e5f5364ef4fb4cc7a8412fd9c5c2e9fa

Removed the Main.particle list, used for ParticleSettings ID blocks.

There were still some type-agnostic uses as well, owing to the generic
ListBase type.

===================================================================

M	source/blender/blenkernel/BKE_main.h
M	source/blender/blenkernel/intern/anim_sys.c
M	source/blender/blenkernel/intern/library.c
M	source/blender/blenloader/intern/versioning_legacy.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index 44e4da4..d25202f 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -94,7 +94,6 @@ typedef struct Main {
 	ListBase action;
 	ListBase nodetree;
 	ListBase brush;
-	ListBase particle;
 	ListBase palettes;
 	ListBase paintcurves;
 	ListBase wm;
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 1f23815..9afee55 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1133,9 +1133,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);
 
@@ -1226,9 +1223,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);
 
@@ -2812,9 +2806,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);
 
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 153a6d1..0a8e914 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -718,7 +718,6 @@ int set_listbasepointers(Main *main, ListBase **lb)
 	lb[a++] = &(main->palettes);
 	lb[a++] = &(main->paintcurves);
 	lb[a++] = &(main->brush);
-	lb[a++] = &(main->particle);
 	lb[a++] = &(main->speaker);
 
 	lb[a++] = &(main->world);
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index cba3dd9..8979a41 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -3080,7 +3080,6 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
 		idproperties_fix_group_lengths(main->action);
 		idproperties_fix_group_lengths(main->nodetree);
 		idproperties_fix_group_lengths(main->brush);
-		idproperties_fix_group_lengths(main->particle);
 	}
 
 	/* sun/sky */




More information about the Bf-blender-cvs mailing list