manual sync with trunk - pulling in changes where the issues are not bmesh spesific

- some merges added lines in multiple times
- removed some NULL checks that were only in bmesh
- enable cycles by default (was disabled because it used not to work)
- make formatting match

2 files changed, 2 insertions, 3 deletions

diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c
index f6dd28c3151..6f014a859db 100644
--- a/source/blender/blenlib/intern/math_vector_inline.c
+++ b/source/blender/blenlib/intern/math_vector_inline.c
@@ -510,7 +510,7 @@ MINLINE float normalize_v3_v3(float r[3], const float a[3])
 	return d;
 }
 
-MINLINE double normalize_dv3(double n[3])
+MINLINE double normalize_v3_d(double n[3])
 {
 	double d= n[0]*n[0] + n[1]*n[1] + n[2]*n[2];
 
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index ebb3937dd91..e79d850caa5 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -35,7 +35,6 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <assert.h>
 
 #include "MEM_guardedalloc.h"
@@ -318,7 +317,7 @@ void BLI_uniquename(ListBase *list, void *vlink, const char defname[], char deli
 
 void BLI_cleanup_path(const char *relabase, char *dir)
 {
-	ptrdiff_t a;
+	short a;
 	char *start, *eind;
 	if (relabase) {
 		BLI_path_abs(dir, relabase);