[Bf-blender-cvs] [4380bfc] cycles_kernel_split: Cycles kernel split : Remove misleading load_kernels progress bar status
varunsundar08
noreply at git.blender.org
Wed May 6 19:57:39 CEST 2015
Commit: 4380bfcc8767da45a423048011d002c61a317187
Author: varunsundar08
Date: Wed May 6 18:38:37 2015 +0530
Branches: cycles_kernel_split
https://developer.blender.org/rB4380bfcc8767da45a423048011d002c61a317187
Cycles kernel split : Remove misleading load_kernels progress bar status
===================================================================
M intern/cycles/render/session.cpp
===================================================================
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index a053a9c..af69294 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -612,6 +612,10 @@ void Session::load_kernels()
{
thread_scoped_lock scene_lock(scene->mutex);
+ string progress_status;
+ string progress_substatus;
+ progress.get_status(progress_status, progress_substatus);
+
if (!kernels_loaded || (device->info.use_split_kernel && !params.background)) {
/* for split kernel, in case if interactive rendering, we
* we need to check kernel-reload before doing path trace
@@ -629,6 +633,11 @@ void Session::load_kernels()
return;
}
+ if (kernels_loaded){
+ /* Viewport render using split kernel */
+ progress.set_status(progress_status, progress_substatus);
+ }
+
kernels_loaded = true;
}
}
More information about the Bf-blender-cvs
mailing list