blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Depsgraph: Remove old depsgraph header from freestyle

This commit is contained in:
Sergey Sharybin 2017-04-06 16:32:59 +02:00
parent 35db70a466
commit 1165027308
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/freestyle/CMakeLists.txt
View File

@ -557,6 +557,7 @@ set(INC
../blenkernel
../blenlib
../blentranslation
../depsgraph
../imbuf
../makesdna
../makesrna

12
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
View File

@ -44,7 +44,6 @@ extern "C" {
#include "DNA_scene_types.h"
#include "BKE_customdata.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_library.h" /* free_libblock */
#include "BKE_material.h"
@ -59,6 +58,9 @@ extern "C" {
#include "BLI_math_vector.h"
#include "BLI_utildefines.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
#include "RE_pipeline.h"
#include "render_types.h"
@ -128,7 +130,7 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
// Camera
Object *object_camera = BKE_object_add(freestyle_bmain, freestyle_scene, (SceneLayer *)freestyle_scene->render_layers.first, OB_CAMERA, NULL);
DAG_relations_tag_update(freestyle_bmain);
DEG_relations_tag_update(freestyle_bmain);
Camera *camera = (Camera *)object_camera->data;
camera->type = CAM_ORTHO;
@ -510,7 +512,7 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const
// If still no material, create one
if (!has_mat) {
Material *ma = BKE_material_add(freestyle_bmain, "stroke_material");
DAG_relations_tag_update(freestyle_bmain);
DEG_relations_tag_update(freestyle_bmain);
ma->mode |= MA_VERTEXCOLP;
ma->mode |= MA_TRANSP;
ma->mode |= MA_SHLESS;
@ -933,7 +935,7 @@ Object *BlenderStrokeRenderer::NewMesh() const
ob->lay = 1;
base = BKE_scene_base_add(freestyle_scene, ob);
DAG_relations_tag_update(freestyle_bmain);
DEG_relations_tag_update(freestyle_bmain);
#if 0
BKE_scene_base_deselect_all(scene);
BKE_scene_base_select(scene, base);
@ -941,7 +943,7 @@ Object *BlenderStrokeRenderer::NewMesh() const
(void)base;
#endif
DAG_id_tag_update_ex(freestyle_bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
DEG_id_tag_update_ex(freestyle_bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
return ob;
}