Merge various small changes from render branch:

* Division by zero fix for TNT SVD code.
* Sound fix, in case ffmpeg decode fails, don't use the samples.
* Fix for incorrect bounds of transformed objects in new raytracing code.
* Gave memory arena's a name used for allocations for easier memory
  usage debugging.
* Dupligroup no_draw option was using layers but not restrict view/render
  setting. (not a bugfix exactly but would do display list context switching
  while drawing for no reason).
* Fix objects instanced on hair particles not giving consistent results
  when the object is transformed.
* New math functions: madd_v4_v4fl, len_squared_v3v3, interp_v4_v4v4v4,
  mul_v4_m4v4, SH and form factor functions, box_minmax_bounds_m4.
* mul_m4_m4m4 and mul_m3_m3m3 now accept the same pointers for multiple
  arguments.
* endjob callback for WM jobs system.
* Geometry node uv/color layer now has search list/autocomplete.
* Various small buildsystem tweaks, not strictly needed yet in trunk.

1 files changed, 5 insertions, 3 deletions

diff --git a/source/blender/blenlib/intern/BLI_memarena.c b/source/blender/blenlib/intern/BLI_memarena.c
index 07e22b30fcc..cdb88e91cad 100644
--- a/source/blender/blenlib/intern/BLI_memarena.c
+++ b/source/blender/blenlib/intern/BLI_memarena.c
@@ -41,6 +41,7 @@
 struct MemArena {
 	unsigned char *curbuf;
 	int bufsize, cursize;
+	const char *name;
 	
 	int use_calloc;	
 	int align;
@@ -48,10 +49,11 @@ struct MemArena {
 	LinkNode *bufs;
 };
 
-MemArena *BLI_memarena_new(int bufsize) {
+MemArena *BLI_memarena_new(int bufsize, const char *name) {
 	MemArena *ma= MEM_callocN(sizeof(*ma), "memarena");
 	ma->bufsize= bufsize;
 	ma->align = 8;
+	ma->name= name;
 	
 	return ma;
 }
@@ -94,9 +96,9 @@ void *BLI_memarena_alloc(MemArena *ma, int size) {
 		else ma->cursize = ma->bufsize;
 
 		if(ma->use_calloc)
-			ma->curbuf= MEM_callocN(ma->cursize, "memarena calloc");
+			ma->curbuf= MEM_callocN(ma->cursize, ma->name);
 		else
-			ma->curbuf= MEM_mallocN(ma->cursize, "memarena malloc");
+			ma->curbuf= MEM_mallocN(ma->cursize, ma->name);
 		
 		BLI_linklist_prepend(&ma->bufs, ma->curbuf);