archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Depsgraph: Use explicit graph API in transform code

Browse Source
This commit is contained in:
Sergey Sharybin
2017-11-03 14:05:49 +01:00
parent 57ec215677
commit 95ccaed9e6
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/transform/transform_conversions.c
View File

@@ -5536,7 +5536,11 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob)
/* it deselects Bases, so we have to call the clear function always after */
static void set_trans_object_base_flags(TransInfo *t)
{
/* TODO(sergey): Get rid of global, use explicit main. */
Main *bmain = G.main;
SceneLayer *sl = t->scene_layer;
Scene *scene = t->scene;
Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, sl);
/*
* if Base selected and has parent selected:
@@ -5552,7 +5556,7 @@ static void set_trans_object_base_flags(TransInfo *t)
BKE_scene_base_flag_to_objects(t->scene_layer);
/* Make sure depsgraph is here. */
DEG_scene_relations_update(G.main, t->scene);
DEG_graph_relations_update(depsgraph, bmain, scene);
/* handle pending update events, otherwise they got copied below */
EvaluationContext eval_ctx;
@@ -5603,7 +5607,7 @@ static void set_trans_object_base_flags(TransInfo *t)
}
/* all recalc flags get flushed to all layers, so a layer flip later on works fine */
DEG_graph_flush_update(G.main, t->scene->depsgraph_legacy);
DEG_graph_flush_update(bmain, depsgraph);
/* and we store them temporal in base (only used for transform code) */
/* this because after doing updates, the object->recalc is cleared */
@@ -5633,7 +5637,11 @@ static bool mark_children(Object *ob)
static int count_proportional_objects(TransInfo *t)
{
int total = 0;
/* TODO(sergey): Get rid of global, use explicit main. */
Main *bmain = G.main;
SceneLayer *sl = t->scene_layer;
Scene *scene = t->scene;
Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, sl);
Base *base;
/* rotations around local centers are allowed to propagate, so we take all objects */
@@ -5682,8 +5690,8 @@ static int count_proportional_objects(TransInfo *t)
/* all recalc flags get flushed to all layers, so a layer flip later on works fine */
DEG_scene_relations_update(G.main, t->scene);
DEG_graph_flush_update(G.main, t->scene->depsgraph_legacy);
DEG_graph_relations_update(depsgraph, bmain, scene);
DEG_graph_flush_update(bmain, depsgraph);
/* and we store them temporal in base (only used for transform code) */
/* this because after doing updates, the object->recalc is cleared */