[Bf-blender-cvs] [d82c6ce] particles_refactor: Single display 'add' function, is easier to provide as API method.

Lukas Tönne noreply at git.blender.org
Tue Apr 22 12:06:59 CEST 2014


Commit: d82c6ce507a257c9707f8b8761dd6787b7a156d1
Author: Lukas Tönne
Date:   Fri Jan 3 12:42:44 2014 +0100
https://developer.blender.org/rBd82c6ce507a257c9707f8b8761dd6787b7a156d1

Single display 'add' function, is easier to provide as API method.

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

M	source/blender/blenkernel/BKE_nparticle.h
M	source/blender/blenkernel/intern/nparticle.c
M	source/blender/modifiers/intern/MOD_nparticle.c

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

diff --git a/source/blender/blenkernel/BKE_nparticle.h b/source/blender/blenkernel/BKE_nparticle.h
index 9a84917..701d623 100644
--- a/source/blender/blenkernel/BKE_nparticle.h
+++ b/source/blender/blenkernel/BKE_nparticle.h
@@ -115,8 +115,7 @@ BLI_INLINE NParticleID BKE_nparticle_iter_get_id(struct NParticleIterator *it)
 }
 
 
-struct NParticleDisplay *BKE_nparticle_display_add_particle(struct NParticleSystem *psys);
-struct NParticleDisplay *BKE_nparticle_display_add_dupli(struct NParticleSystem *psys);
+struct NParticleDisplay *BKE_nparticle_display_add(struct NParticleSystem *psys, int type);
 struct NParticleDisplay *BKE_nparticle_display_copy(struct NParticleSystem *psys, struct NParticleDisplay *display);
 void BKE_nparticle_display_free(struct NParticleSystem *psys, struct NParticleDisplay *display);
 
diff --git a/source/blender/blenkernel/intern/nparticle.c b/source/blender/blenkernel/intern/nparticle.c
index 1ef6bae..5e0ca92 100644
--- a/source/blender/blenkernel/intern/nparticle.c
+++ b/source/blender/blenkernel/intern/nparticle.c
@@ -610,21 +610,16 @@ void BKE_nparticle_iter_set_pointer(NParticleIterator *it, const char *attr, voi
 }
 
 
-NParticleDisplay *BKE_nparticle_display_add_particle(NParticleSystem *psys)
+NParticleDisplay *BKE_nparticle_display_add(NParticleSystem *psys, int type)
 {
 	NParticleDisplay *display = MEM_callocN(sizeof(NParticleDisplay), "particle display");
-	display->type = PAR_DISPLAY_PARTICLE;
-	BLI_strncpy(display->attribute, "position", sizeof(display->attribute));
+	display->type = type;
 	
-	BLI_addtail(&psys->display, display);
-	return display;
-}
-
-NParticleDisplay *BKE_nparticle_display_add_dupli(NParticleSystem *psys)
-{
-	NParticleDisplay *display = MEM_callocN(sizeof(NParticleDisplay), "particle display");
-	display->type = PAR_DISPLAY_DUPLI;
-	BLI_strncpy(display->attribute, "position", sizeof(display->attribute));
+	switch (type) {
+		case PAR_DISPLAY_PARTICLE:
+			BLI_strncpy(display->attribute, "position", sizeof(display->attribute));
+			break;
+	}
 	
 	BLI_addtail(&psys->display, display);
 	return display;
diff --git a/source/blender/modifiers/intern/MOD_nparticle.c b/source/blender/modifiers/intern/MOD_nparticle.c
index 0419077..d89f79e 100644
--- a/source/blender/modifiers/intern/MOD_nparticle.c
+++ b/source/blender/modifiers/intern/MOD_nparticle.c
@@ -50,7 +50,7 @@ static void nparticle_system_initData(ModifierData *md)
 	pmd->psys = BKE_nparticle_system_new();
 	
 	/* add default particle display */
-	BKE_nparticle_display_add_particle(pmd->psys);
+	BKE_nparticle_display_add(pmd->psys, PAR_DISPLAY_PARTICLE);
 }
 
 static void nparticle_system_freeData(ModifierData *md)




More information about the Bf-blender-cvs mailing list