Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes

Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];

The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42

Conflicts:
	intern/cycles/SConscript
	intern/cycles/blender/addon/__init__.py
	intern/cycles/blender/addon/properties.py
	intern/cycles/blender/blender_camera.cpp
	intern/cycles/kernel/kernel_types.h
	intern/cycles/kernel/svm/svm.h
	intern/cycles/kernel/svm/svm_types.h
	intern/cycles/render/camera.cpp
	intern/cycles/render/camera.h

1 files changed, 7 insertions, 1 deletions

diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 51a0c5a7b0f..a7ff4244d5f 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -73,6 +73,7 @@ static const char *includefiles[] = {
 	"DNA_key_types.h",
 	"DNA_text_types.h",
 	"DNA_packedFile_types.h",
+	"DNA_gpu_types.h",
 	"DNA_camera_types.h",
 	"DNA_image_types.h",
 	"DNA_texture_types.h",
@@ -538,6 +539,11 @@ static void *read_file_data(char *filename, int *r_len)
 	*r_len = ftell(fp);
 	fseek(fp, 0L, SEEK_SET);
 
+	if (*r_len == -1) {
+		fclose(fp);
+		return NULL;
+	}
+
 	data = MEM_mallocN(*r_len, "read_file_data");
 	if (!data) {
 		*r_len = -1;
@@ -909,7 +915,7 @@ static void dna_write(FILE *file, const void *pntr, const int size)
 	int i;
 	const char *data;
 
-	data = (char *) pntr;
+	data = (const char *)pntr;
 	
 	for (i = 0; i < size; i++) {
 		fprintf(file, "%d, ", data[i]);