Merge with trunk r41197

4 files changed, 12 insertions, 12 deletions

diff --git a/source/blender/render/intern/include/raycounter.h b/source/blender/render/intern/include/raycounter.h
index 4d4952cb6c3..7acef6d3c67 100644
--- a/source/blender/render/intern/include/raycounter.h
+++ b/source/blender/render/intern/include/raycounter.h
@@ -35,7 +35,7 @@
 #ifndef RE_RAYCOUNTER_H
 #define RE_RAYCOUNTER_H
 
-//#define RE_RAYCOUNTER			/* enable counters per ray, usefull for measuring raytrace structures performance */
+//#define RE_RAYCOUNTER			/* enable counters per ray, useful for measuring raytrace structures performance */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/render/intern/raytrace/bvh.h b/source/blender/render/intern/raytrace/bvh.h
index 3ba5bbc624e..c7a1b002d61 100644
--- a/source/blender/render/intern/raytrace/bvh.h
+++ b/source/blender/render/intern/raytrace/bvh.h
@@ -167,7 +167,7 @@ static inline void bvh_node_merge_bb(Node *node, float *min, float *max)
 
 
 /*
- * recursivly transverse a BVH looking for a rayhit using a local stack
+ * recursively transverse a BVH looking for a rayhit using a local stack
  */
 template<class Node> static inline void bvh_node_push_childs(Node *node, Isect *isec, Node **stack, int &stack_pos);
 
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 7835ae6dcd3..5ca0983ffd0 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -478,7 +478,7 @@ static void scene_unique_exr_name(Scene *scene, char *str, int sample)
 	else
 		BLI_snprintf(name, sizeof(name), "%s_%s%d.exr", fi, scene->id.name+2, sample);
 
-	BLI_make_file_string("/", str, btempdir, name);
+	BLI_make_file_string("/", str, BLI_temporary_dir(), name);
 }
 
 static void render_unique_exr_name(Render *re, char *str, int sample)
@@ -2261,7 +2261,7 @@ static void ntree_render_scenes(Render *re)
 					restore_scene= (scene != re->scene);
 					node->id->flag &= ~LIB_DOIT;
 					
-					NodeTagChanged(re->scene->nodetree, node);
+					nodeUpdate(re->scene->nodetree, node);
 				}
 			}
 		}
@@ -2468,7 +2468,7 @@ static void do_render_composite_fields_blur_3d(Render *re)
 			ntreeCompositTagAnimated(ntree);
 		}
 		
-		if(ntree && re->r.scemode & R_DOCOMP) {
+		if(ntree && re->scene->use_nodes && re->r.scemode & R_DOCOMP) {
 			/* checks if there are render-result nodes that need scene */
 			if((re->r.scemode & R_SINGLE_LAYER)==0)
 				ntree_render_scenes(re);
@@ -2753,7 +2753,7 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
 		
 		scene_unique_exr_name(scene, str, 0);
 		
-		if (BLI_is_writable(str)==0) {
+		if (BLI_file_is_writable(str)==0) {
 			BKE_report(reports, RPT_ERROR, "Can not save render buffers, check the temp default path");
 			return 0;
 		}
@@ -3146,13 +3146,13 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 				if(scene->r.mode & (R_NO_OVERWRITE | R_TOUCH))
 					BKE_makepicstring(name, scene->r.pic, scene->r.cfra, scene->r.imtype, scene->r.scemode & R_EXTENSION, TRUE);
 
-				if(scene->r.mode & R_NO_OVERWRITE && BLI_exist(name)) {
+				if(scene->r.mode & R_NO_OVERWRITE && BLI_exists(name)) {
 					printf("skipping existing frame \"%s\"\n", name);
 					continue;
 				}
-				if(scene->r.mode & R_TOUCH && !BLI_exist(name)) {
+				if(scene->r.mode & R_TOUCH && !BLI_exists(name)) {
 					BLI_make_existing_file(name); /* makes the dir if its not there */
-					BLI_touch(name);
+					BLI_file_touch(name);
 				}
 			}
 
@@ -3175,7 +3175,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 			if(G.afbreek==1) {
 				/* remove touched file */
 				if(BKE_imtype_is_movie(scene->r.imtype) == 0) {
-					if (scene->r.mode & R_TOUCH && BLI_exist(name) && BLI_filepathsize(name) == 0) {
+					if (scene->r.mode & R_TOUCH && BLI_exists(name) && BLI_file_size(name) == 0) {
 						BLI_delete(name, 0, 0);
 					}
 				}
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index 7a39342ac8d..a73bf93841d 100644
--- a/source/blender/render/intern/source/renderdatabase.c
+++ b/source/blender/render/intern/source/renderdatabase.c
@@ -481,12 +481,12 @@ void RE_set_customdata_names(ObjectRen *obr, CustomData *data)
 		layer= &data->layers[i];
 
 		if (layer->type == CD_MTFACE) {
-			strcpy(obr->mtface[mtfn++], layer->name);
+			BLI_strncpy(obr->mtface[mtfn++], layer->name, sizeof(layer->name));
 			obr->actmtface= CLAMPIS(layer->active_rnd, 0, numtf);
 			obr->bakemtface= layer->active;
 		}
 		else if (layer->type == CD_MCOL) {
-			strcpy(obr->mcol[mcn++], layer->name);
+			BLI_strncpy(obr->mcol[mcn++], layer->name, sizeof(layer->name));
 			obr->actmcol= CLAMPIS(layer->active_rnd, 0, numcol);
 		}
 	}