Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: Remove old depsgraph header from blender internal

Browse Source
This commit is contained in:
Sergey Sharybin
2017-04-06 16:38:43 +02:00
parent 2d80f37bce
commit ed1ef06199
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/render/intern/source/convertblender.c
View File

@@ -66,7 +66,6 @@
#include "BKE_customdata.h" #include "BKE_customdata.h"
#include "BKE_colortools.h" #include "BKE_colortools.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_depsgraph.h"
#include "BKE_DerivedMesh.h" #include "BKE_DerivedMesh.h"
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_key.h" #include "BKE_key.h"
@@ -82,6 +81,8 @@
#include "BKE_particle.h" #include "BKE_particle.h"
#include "BKE_scene.h" #include "BKE_scene.h"
#include "DEG_depsgraph.h"
#include "PIL_time.h" #include "PIL_time.h"
#include "envmap.h" #include "envmap.h"
@@ -5221,7 +5222,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l
RE_SetView(re, mat); RE_SetView(re, mat);
/* force correct matrix for scaled cameras */ /* force correct matrix for scaled cameras */
DAG_id_tag_update_ex(re->main, &camera->id, OB_RECALC_OB); DEG_id_tag_update_ex(re->main, &camera->id, OB_RECALC_OB);
} }
/* store for incremental render, viewmat rotates dbase */ /* store for incremental render, viewmat rotates dbase */

5
source/blender/render/intern/source/multires_bake.c
View File

@@ -42,7 +42,6 @@
#include "BLI_threads.h" #include "BLI_threads.h"
#include "BKE_ccg.h" #include "BKE_ccg.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_image.h" #include "BKE_image.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"
@@ -50,6 +49,8 @@
#include "BKE_modifier.h" #include "BKE_modifier.h"
#include "BKE_subsurf.h" #include "BKE_subsurf.h"
#include "DEG_depsgraph.h"
#include "RE_multires_bake.h" #include "RE_multires_bake.h"
#include "RE_pipeline.h" #include "RE_pipeline.h"
#include "RE_shader_ext.h" #include "RE_shader_ext.h"
@@ -1283,7 +1284,7 @@ static void finish_images(MultiresBakeRender *bkr, MultiresBakeResult *result)
} }
BKE_image_release_ibuf(ima, ibuf, NULL); BKE_image_release_ibuf(ima, ibuf, NULL);
DAG_id_tag_update(&ima->id, 0); DEG_id_tag_update(&ima->id, 0);
} }
} }

11
source/blender/render/intern/source/pipeline.c
View File

@@ -62,7 +62,6 @@
#include "BKE_animsys.h" /* <------ should this be here?, needed for sequencer update */ #include "BKE_animsys.h" /* <------ should this be here?, needed for sequencer update */
#include "BKE_camera.h" #include "BKE_camera.h"
#include "BKE_colortools.h" #include "BKE_colortools.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_image.h" #include "BKE_image.h"
#include "BKE_library.h" #include "BKE_library.h"
@@ -78,6 +77,8 @@
#include "BKE_writeavi.h" /* <------ should be replaced once with generic movie module */ #include "BKE_writeavi.h" /* <------ should be replaced once with generic movie module */
#include "BKE_object.h" #include "BKE_object.h"
#include "DEG_depsgraph.h"
#include "PIL_time.h" #include "PIL_time.h"
#include "IMB_colormanagement.h" #include "IMB_colormanagement.h"
#include "IMB_imbuf.h" #include "IMB_imbuf.h"
@@ -2039,22 +2040,22 @@ static void tag_dependend_objects_for_render(Scene *scene, int UNUSED(renderlay)
if (md->type == eModifierType_Boolean) { if (md->type == eModifierType_Boolean) {
BooleanModifierData *bmd = (BooleanModifierData *)md; BooleanModifierData *bmd = (BooleanModifierData *)md;
if (bmd->object && bmd->object->type == OB_MESH) { if (bmd->object && bmd->object->type == OB_MESH) {
DAG_id_tag_update(&bmd->object->id, OB_RECALC_DATA); DEG_id_tag_update(&bmd->object->id, OB_RECALC_DATA);
} }
} }
else if (md->type == eModifierType_Array) { else if (md->type == eModifierType_Array) {
ArrayModifierData *amd = (ArrayModifierData *)md; ArrayModifierData *amd = (ArrayModifierData *)md;
if (amd->start_cap && amd->start_cap->type == OB_MESH) { if (amd->start_cap && amd->start_cap->type == OB_MESH) {
DAG_id_tag_update(&amd->start_cap->id, OB_RECALC_DATA); DEG_id_tag_update(&amd->start_cap->id, OB_RECALC_DATA);
} }
if (amd->end_cap && amd->end_cap->type == OB_MESH) { if (amd->end_cap && amd->end_cap->type == OB_MESH) {
DAG_id_tag_update(&amd->end_cap->id, OB_RECALC_DATA); DEG_id_tag_update(&amd->end_cap->id, OB_RECALC_DATA);
} }
} }
else if (md->type == eModifierType_Shrinkwrap) { else if (md->type == eModifierType_Shrinkwrap) {
ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *)md; ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *)md;
if (smd->target && smd->target->type == OB_MESH) { if (smd->target && smd->target->type == OB_MESH) {
DAG_id_tag_update(&smd->target->id, OB_RECALC_DATA); DEG_id_tag_update(&smd->target->id, OB_RECALC_DATA);
} }
} }
} }