Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-05-09 16:44:49 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-05-09 17:21:24 +0300
commit5d71399c04112107d730e4f8943ee67fd5e34e9b (patch)
tree01ef5561db50a4c6d3e35120aa67bcf5bdd68e18 /source/blender/blenkernel/intern/particle_system.c
parentc7ef9969b967d305d9da98a659f47c07a2c69e00 (diff)
Depsgraph: Remove particle edit code from evaluation
Everything seems to be working without this, which makes since there is no evaluation-time edit code in master. The only tricky part here would be that this means we might want to ensure edit structure exists from inside particle mode in draw manager. Other point for not having this code in evaluation is that it's possible to have same object evaluated in different contexts at the same time, and since edit structures are supposed to be in original object we might run into threading conflict.
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
-rw-r--r--source/blender/blenkernel/intern/particle_system.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index ab307ebdbe8..bc3218723ac 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -96,9 +96,6 @@
#include "RE_shader_ext.h"
-/* FIXME: BAD LEVEL CALL. */
-#include "../../editors/include/ED_particle.h"
-
/* fluid sim particle import */
#ifdef WITH_MOD_FLUID
#include "DNA_object_fluidsim_types.h"
@@ -4385,22 +4382,6 @@ void particle_system_update(struct Depsgraph *depsgraph, Scene *scene, Object *o
/* save matrix for duplicators, at rendertime the actual dupliobject's matrix is used so don't update! */
invert_m4_m4(psys->imat, ob->obmat);
- if (ob->mode & OB_MODE_PARTICLE_EDIT && ob == OBACT(DEG_get_evaluated_view_layer(depsgraph))) {
- PTCacheEdit *edit = PE_create_current(depsgraph, scene, ob);
-
- if (edit && edit->psys == psys) {
- if (edit->psys && edit->psys->flag & PSYS_HAIR_UPDATED) {
- PE_update_object(depsgraph, scene, ob, 0);
- }
-
- /* create path and child path cache if it doesn't exist already */
- if (edit->pathcache == NULL) {
- psys_cache_edit_paths(depsgraph, scene, ob, edit, DEG_get_ctime(depsgraph), DEG_get_mode(depsgraph) == DAG_EVAL_RENDER);
-
- }
- }
- }
-
BKE_particle_batch_cache_dirty(psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
}