[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58773] branches/soc-2013-dingto/intern/ cycles/kernel/kernel_shader.h: Cycles / Non-Progressive integrator:

[Thomas Dinges]

Revision: 58773
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58773
Author:   dingto
Date:     2013-07-31 18:46:11 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Cycles / Non-Progressive integrator:
* Code cleanup, to avoid separate code for CPU and GPU. 

Modified Paths:
--------------
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_shader.h

Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_shader.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_shader.h	2013-07-31 18:40:11 UTC (rev 58772)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_shader.h	2013-07-31 18:46:11 UTC (rev 58773)
@@ -956,13 +956,9 @@
 
 				int size = sd->num_closure - (j+1);
 				if(size > 0) {
-#ifdef __KERNEL_GPU__
 					for(int k = 0; k < size; k++) {
 						scj[k] = scj[k+1];
 					}
-#else
-					memmove(scj, scj+1, size*sizeof(ShaderClosure));
-#endif
 				}
 
 				sd->num_closure--;