[Bf-blender-cvs] [3af69a0a49] temp-cycles-denoising: Cycles Denoising: Remove unused functions left over from the denoise-after-rendering removal
Lukas Stockner
noreply at git.blender.org
Fri Mar 24 20:18:30 CET 2017
Commit: 3af69a0a49ba5e58ccb8a43bbf4390a1fc7061ae
Author: Lukas Stockner
Date: Fri Feb 17 03:51:30 2017 +0100
Branches: temp-cycles-denoising
https://developer.blender.org/rB3af69a0a49ba5e58ccb8a43bbf4390a1fc7061ae
Cycles Denoising: Remove unused functions left over from the denoise-after-rendering removal
===================================================================
M intern/cycles/blender/addon/__init__.py
M intern/cycles/blender/addon/engine.py
M intern/cycles/blender/blender_session.h
M intern/cycles/blender/blender_sync.h
M intern/cycles/render/session.cpp
M intern/cycles/render/session.h
===================================================================
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index d4903f16c0..eb792af726 100644
--- a/intern/cycles/blender/addon/__init__.py
+++ b/intern/cycles/blender/addon/__init__.py
@@ -58,7 +58,6 @@ class CyclesRender(bpy.types.RenderEngine):
bl_use_exclude_layers = True
bl_use_save_buffers = True
bl_use_spherical_stereo = True
- bl_use_result_postprocess = True
def __init__(self):
self.session = None
@@ -103,12 +102,6 @@ class CyclesRender(bpy.types.RenderEngine):
else:
self.report({'ERROR'}, "OSL support disabled in this build.")
- def can_postprocess(self, result):
- return engine.can_postprocess(result)
-
- def postprocess(self, scene, result):
- engine.postprocess(scene, result);
-
def engine_exit():
engine.exit()
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index ba85e1a762..ab57dd44bd 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -205,9 +205,3 @@ def with_network():
def system_info():
import _cycles
return _cycles.system_info()
-
-def can_postprocess(result):
- return False
-
-def postprocess(scene, result):
- return
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h
index 3e191cd1d4..bd9ebab309 100644
--- a/intern/cycles/blender/blender_session.h
+++ b/intern/cycles/blender/blender_session.h
@@ -170,8 +170,6 @@ protected:
void update_resumable_tile_manager(int num_samples);
};
-bool can_denoise_render_result(BL::RenderResult& b_rr);
-
CCL_NAMESPACE_END
#endif /* __BLENDER_SESSION_H__ */
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index bb76031c09..6984cbda25 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -93,10 +93,6 @@ public:
Camera *cam,
int width, int height);
- static RenderBuffers* get_render_buffer(Device *device,
- BL::RenderLayer& b_rl,
- BL::RenderResult& b_rr,
- int samples);
private:
/* sync */
void sync_lamps(bool update_all);
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index c39264d1b8..3acb81de43 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -105,7 +105,7 @@ Session::~Session()
/* tonemap and write out image if requested */
delete display;
- display = new DisplayBuffer(device, params.output_half_float);
+ display = new DisplayBuffer(device, false);
display->reset(device, buffers->params);
tonemap(params.samples);
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h
index 408ac70d1a..61dbed0651 100644
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -45,9 +45,7 @@ public:
DeviceInfo device;
bool background;
bool progressive_refine;
-
string output_path;
- bool output_half_float;
bool progressive;
bool experimental;
@@ -80,7 +78,6 @@ public:
progressive_refine = false;
output_path = "";
- output_half_float = false;
progressive = false;
experimental = false;
@@ -113,7 +110,6 @@ public:
&& background == params.background
&& progressive_refine == params.progressive_refine
&& output_path == params.output_path
- && output_half_float == params.output_half_float
/* && samples == params.samples */
&& progressive == params.progressive
&& experimental == params.experimental
More information about the Bf-blender-cvs
mailing list