[Bf-blender-cvs] [f74c6046462] blender2.8: Remove unused functions which will break with copy-on-write

Sergey Sharybin noreply at git.blender.org
Fri May 11 12:49:40 CEST 2018


Commit: f74c604646294aa8d99b29780f863307fb2c3c0b
Author: Sergey Sharybin
Date:   Fri May 11 12:47:27 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf74c604646294aa8d99b29780f863307fb2c3c0b

Remove unused functions which will break with copy-on-write

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

M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_manager.c
M	source/blender/editors/include/ED_particle.h
M	source/blender/editors/physics/particle_edit.c

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

diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index f343855ead1..88d40f565c5 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -449,7 +449,6 @@ int  DRW_object_is_mode_shade(const struct Object *ob);
 int  DRW_object_is_paint_mode(const struct Object *ob);
 
 bool DRW_check_particles_visible_within_active_context(struct Object *object);
-bool DRW_check_psys_visible_within_active_context(struct ParticleSystem *psys);
 
 /* Draw commands */
 void DRW_draw_pass(DRWPass *pass);
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index f3a841a17cb..6b37c661bbf 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -228,11 +228,6 @@ bool DRW_check_particles_visible_within_active_context(Object *object)
 	return (object->mode != OB_MODE_PARTICLE_EDIT);
 }
 
-bool DRW_check_psys_visible_within_active_context(struct ParticleSystem *psys)
-{
-	return PE_get_current_from_psys(psys) == NULL;
-}
-
 /** \} */
 
 
diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h
index 8b522c91188..ef0690546c0 100644
--- a/source/blender/editors/include/ED_particle.h
+++ b/source/blender/editors/include/ED_particle.h
@@ -47,7 +47,6 @@ void PE_free_ptcache_edit(struct PTCacheEdit *edit);
 int PE_start_edit(struct PTCacheEdit *edit);
 
 /* access */
-struct PTCacheEdit *PE_get_current_from_psys(struct ParticleSystem *psys);
 struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob);
 struct PTCacheEdit *PE_create_current(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob);
 void PE_current_changed(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob);
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index f65e598e204..d42989424be 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -191,24 +191,6 @@ static float pe_brush_size_get(const Scene *UNUSED(scene), ParticleBrushData *br
 	return brush->size * U.pixelsize;
 }
 
-PTCacheEdit *PE_get_current_from_psys(ParticleSystem *psys)
-{
-	if (psys->part && psys->part->type == PART_HAIR) {
-		if ((psys->flag & PSYS_HAIR_DYNAMICS) != 0 &&
-		    (psys->pointcache->flag & PTCACHE_BAKED) != 0)
-		{
-			return psys->pointcache->edit;
-		}
-		else {
-			return psys->edit;
-		}
-	}
-	else if (psys->pointcache->flag & PTCACHE_BAKED) {
-		return psys->pointcache->edit;
-	}
-	return NULL;
-}
-
 /* always gets at least the first particlesystem even if PSYS_CURRENT flag is not set
  *
  * note: this function runs on poll, therefor it can runs many times a second



More information about the Bf-blender-cvs mailing list