Commit: 24f759ba5a16305d57c285dbff080d8adb116ed1
Author: Tamito Kajiyama
Date: Tue Feb 27 13:02:58 2018 +0900
Branches: blender2.8
https://developer.blender.org/rB24f759ba5a16305d57c285dbff080d8adb116ed1
Revert "F12 offline Freestyle rendering support in Eevee"
This reverts commit 8a7c0abc2d548d88b755a1c712aa06f0ee631076.
===================================================================
M release/scripts/startup/bl_ui/properties_freestyle.py
M release/scripts/startup/bl_ui/properties_view_layer.py
M
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py
b/release/scripts/startup/bl_ui/properties_freestyle.py
index 0e2c6e4a28a..d9f28040b16 100644
--- a/release/scripts/startup/bl_ui/properties_freestyle.py
+++ b/release/scripts/startup/bl_ui/properties_freestyle.py
@@ -39,7 +39,7 @@ class RenderFreestyleButtonsPanel:
class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel):
bl_label = "Freestyle"
bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
+ COMPAT_ENGINES = {'BLENDER_RENDER'}
def draw_header(self, context):
rd = context.scene.render
@@ -111,7 +111,7 @@ class RENDER_MT_lineset_specials(Menu):
class VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel):
bl_label = "Freestyle"
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
+ COMPAT_ENGINES = {'BLENDER_RENDER'}
def draw(self, context):
layout = self.layout
@@ -167,7 +167,7 @@ class
VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel):
class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel,
Panel):
bl_label = "Freestyle Line Set"
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
+ COMPAT_ENGINES = {'BLENDER_RENDER'}
def draw_edge_type_buttons(self, box, lineset, edge_type):
# property names
@@ -262,7 +262,7 @@ class
VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel
class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel,
Panel):
bl_label = "Freestyle Line Style"
bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
+ COMPAT_ENGINES = {'BLENDER_RENDER'}
def draw_modifier_box_header(self, box, modifier):
row = box.row()
@@ -819,7 +819,7 @@ class MaterialFreestyleButtonsPanel:
class MATERIAL_PT_freestyle_line(MaterialFreestyleButtonsPanel, Panel):
bl_label = "Freestyle Line"
bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
+ COMPAT_ENGINES = {'BLENDER_RENDER'}
def draw(self, context):
layout = self.layout
diff --git a/release/scripts/startup/bl_ui/properties_view_layer.py
b/release/scripts/startup/bl_ui/properties_view_layer.py
index 6194857a95b..4d61aacbf22 100644
--- a/release/scripts/startup/bl_ui/properties_view_layer.py
+++ b/release/scripts/startup/bl_ui/properties_view_layer.py
@@ -457,7 +457,6 @@ class
VIEWLAYER_PT_eevee_layer_passes(ViewLayerButtonsPanel, Panel):
def draw(self, context):
layout = self.layout
- with_freestyle = bpy.app.build_options.freestyle
scene = context.scene
rd = scene.render
@@ -478,12 +477,6 @@ class
VIEWLAYER_PT_eevee_layer_passes(ViewLayerButtonsPanel, Panel):
row = col.row(align=True)
row.prop(view_layer, "use_pass_subsurface_direct", text="Direct",
toggle=True)
row.prop(view_layer, "use_pass_subsurface_color", text="Color",
toggle=True)
- if with_freestyle:
- col.separator()
- col.label(text="Layer:")
- row = col.row()
- row.prop(view_layer, "use_freestyle", "Use Freestyle")
- row.active = rd.use_freestyle
classes = (
diff --git
a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 12cb3e3f3f8..977bca66731 100644
---
a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++
b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
