Merged changes in the trunk up to revision 55357.

Resolved conflicts:
release/datafiles/startup.blend
source/blender/editors/space_nla/nla_buttons.c

Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of
recent changes for the use of bool.

1 files changed, 10 insertions, 7 deletions

diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c
index 8fab0f2d4df..11d3e69120d 100644
--- a/source/blender/blenkernel/intern/idcode.c
+++ b/source/blender/blenkernel/intern/idcode.c
@@ -30,12 +30,13 @@
  *  \ingroup bke
  */
 
- 
 #include <stdlib.h>
 #include <string.h>
 
 #include "DNA_ID.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_idcode.h"
 
 typedef struct {
@@ -91,9 +92,11 @@ static IDType *idtype_from_name(const char *str)
 {
 	int i = nidtypes;
 	
-	while (i--)
-		if (strcmp(str, idtypes[i].name) == 0)
+	while (i--) {
+		if (STREQ(str, idtypes[i].name)) {
 			return &idtypes[i];
+		}
+	}
 
 	return NULL;
 }
@@ -108,15 +111,15 @@ static IDType *idtype_from_code(int code)
 	return NULL;
 }
 
-int BKE_idcode_is_valid(int code) 
+bool BKE_idcode_is_valid(int code)
 {
-	return idtype_from_code(code) ? 1 : 0;
+	return idtype_from_code(code) ? true : false;
 }
 
-int BKE_idcode_is_linkable(int code)
+bool BKE_idcode_is_linkable(int code)
 {
 	IDType *idt = idtype_from_code(code);
-	return idt ? (idt->flags & IDTYPE_FLAGS_ISLINKABLE) : 0;
+	return idt ? ((idt->flags & IDTYPE_FLAGS_ISLINKABLE) != 0) : false;
 }
 
 const char *BKE_idcode_to_name(int code)