a guest Jun 14th, 2015 212 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. vanessa@rainbird:~/Minetest-related/minetest_core$ git am ~/2ce5ffeb92c4d76bc8fc9c01fc01a76fe2a6b546.patch
  2. Applying: Improve displacement mapping
  3. /home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch:113: trailing whitespace.
  4.         vec3 eyeRay = normalize(tsEyeVec);     
  5. /home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch:185: trailing whitespace.
  6.                 float specular = pow(clamp(dot(reflect(L,, -E), 0.0, 1.0), 1.0);
  7. /home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch:237: trailing whitespace.
  8. #else
  9. /home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch:240: trailing whitespace.
  11. /home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch:531: trailing whitespace.
  13. error: patch failed: client/shaders/nodes_shader/opengl_vertex.glsl:14
  14. error: client/shaders/nodes_shader/opengl_vertex.glsl: patch does not apply
  15. Patch failed at 0001 Improve displacement mapping
  16. The copy of the patch that failed is found in:
  17.    /home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch
  18. When you have resolved this problem, run "git am --continue".
  19. If you prefer to skip this patch, run "git am --skip" instead.
  20. To restore the original branch and stop patching, run "git am --abort".
  21. vanessa@rainbird:~/Minetest-related/minetest_core$
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand