GPencil: Invert Paste operator and make Paste to Active default

Before there were two options: Paste to original layer called "Paste" and Paste to active   layer called "Paste & Merge"

Now, by default the paste is in active layer and the "Paste & Merge" has been renamed "Paste".

For old "Paste", now is called "Paste by Layer" and it's not the default value anymore.

Note: Minor edits to add icons not present in Differential revision.

Differential Revision: https://developer.blender.org/D5591

1 files changed, 5 insertions, 2 deletions

diff --git a/intern/cycles/kernel/svm/svm_noise.h b/intern/cycles/kernel/svm/svm_noise.h
index e03ffa2bc9d..dd375af27e5 100644
--- a/intern/cycles/kernel/svm/svm_noise.h
+++ b/intern/cycles/kernel/svm/svm_noise.h
@@ -181,9 +181,9 @@ ccl_device_inline ssef scale3_sse(const ssef &result)
 }
 #endif
 
+#ifndef __KERNEL_SSE2__
 ccl_device_noinline_cpu float perlin(float x, float y, float z)
 {
-#ifndef __KERNEL_SSE2__
   int X;
   float fx = floorfrac(x, &X);
   int Y;
@@ -217,7 +217,10 @@ ccl_device_noinline_cpu float perlin(float x, float y, float z)
 
   /* can happen for big coordinates, things even out to 0.0 then anyway */
   return (isfinite(r)) ? r : 0.0f;
+}
 #else
+ccl_device_noinline float perlin(float x, float y, float z)
+{
   ssef xyz = ssef(x, y, z, 0.0f);
   ssei XYZ;
 
@@ -255,8 +258,8 @@ ccl_device_noinline_cpu float perlin(float x, float y, float z)
   ssef rinfmask = ((r & infmask) == infmask).m128;  // 0xffffffff if r is inf/-inf/nan else 0
   ssef rfinite = andnot(rinfmask, r);               // 0 if r is inf/-inf/nan else r
   return extract<0>(rfinite);
-#endif
 }
+#endif
 
 /* perlin noise in range 0..1 */
 ccl_device float noise(float3 p)