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

Revert "F12 offline Freestyle rendering support in Eevee"

Browse Source 
This reverts commit 8a7c0abc2d.
This commit is contained in:
Tamito Kajiyama
2018-02-27 13:02:58 +09:00
parent 8a7c0abc2d
commit 24f759ba5a
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,6 @@ extern "C" {
#include "BKE_node.h"
#include "BKE_object.h"
#include "BKE_scene.h"
#include "BKE_world.h"
#include "BLI_ghash.h"
#include "BLI_listbase.h"
@@ -92,7 +91,6 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
freestyle_scene->r.cfra = old_scene->r.cfra;
freestyle_scene->r.mode = old_scene->r.mode &
~(R_EDGE_FRS | R_SHADOW | R_SSS | R_PANORAMA | R_ENVMAP | R_MBLUR | R_BORDER);
freestyle_scene->r.alphamode = R_ALPHAPREMUL;
freestyle_scene->r.xsch = re->rectx; // old_scene->r.xsch
freestyle_scene->r.ysch = re->recty; // old_scene->r.ysch
freestyle_scene->r.xasp = 1.0f; // old_scene->r.xasp;
@@ -169,13 +167,6 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
freestyle_scene->camera = object_camera;
// World
World *world = BKE_world_add(freestyle_bmain, "FRSWorld");
DEG_graph_id_tag_update(freestyle_bmain, freestyle_depsgraph, &world->id, 0);
world->horr = world->horg = world->horb = 0.0f;
world->zenr = world->zeng = world->zenb = 0.0f;
freestyle_scene->world = world;
// Reset serial mesh ID (used for BlenderStrokeRenderer::NewMesh())
_mesh_id = 0xffffffff;