From 131c2a3208842f36c1958d6f9ff19dde5c2bd76c Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Tue, 30 Aug 2011 14:41:23 +0000
Subject: Fix for [#28425] when user prefs -> editing -> align to == "view"
 newly inserted objects do not show the applied rotation in the tools panel

Patch by Andrew Wiggin, thanks! :)
---
 source/blender/editors/object/object_add.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source/blender')

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 5212bf32834..fa529374bf7 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -276,8 +276,10 @@ int ED_object_add_generic_get_opts(bContext *C, wmOperator *op, float *loc, floa
 		RNA_boolean_set(op->ptr, "view_align", view_align);
 	}
 	
-	if (view_align)
+	if (view_align) {
 		ED_object_rotation_from_view(C, rot);
+		RNA_float_set_array(op->ptr, "rotation", rot);
+	}
 	else
 		RNA_float_get_array(op->ptr, "rotation", rot);
 	
-- 
cgit v1.2.3


From 9eb9d9b7d2492b12cf61859597093980b565694c Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Tue, 30 Aug 2011 15:30:38 +0000
Subject: Fix #28427: smooth faces flash momentarily when extruded using
 "extrude and move on normals" tool (E key)

Update normals just after extrude -- topology is changing when extruding
and normals for non-extruded faces should be recalculated after this.
---
 source/blender/editors/mesh/editmesh_lib.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'source/blender')

diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c
index b7ed6ec14ca..0afa2d01702 100644
--- a/source/blender/editors/mesh/editmesh_lib.c
+++ b/source/blender/editors/mesh/editmesh_lib.c
@@ -1141,6 +1141,9 @@ short extrudeflag_face_indiv(EditMesh *em, short UNUSED(flag), float *UNUSED(nor
 	
 	EM_select_flush(em);
 	
+	/* step 5; update normals after extrude */
+	recalc_editnormals(em);
+
 	return 'n';
 }
 
@@ -1206,6 +1209,9 @@ short extrudeflag_edges_indiv(EditMesh *em, short flag, float *nor)
 		if(eed->v1->f & eed->v2->f & flag) eed->f |= flag;
 	}
 	
+	/* update normals after extrude */
+	recalc_editnormals(em);
+
 	if(is_zero_v3(nor)) return 'g'; // g is grab
 	return 'n';  // n is for normal constraint
 }
@@ -1485,6 +1491,9 @@ static short extrudeflag_edge(Object *obedit, EditMesh *em, short UNUSED(flag),
 
 	EM_select_flush(em);
 
+	/* step 8; update normals after extrude */
+	recalc_editnormals(em);
+
 	if(is_zero_v3(nor)) return 'g'; // grab
 	return 'n'; // normal constraint 
 }
-- 
cgit v1.2.3


From c6f994062e4f871aa2f81c289b49ac7245b3056c Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Tue, 30 Aug 2011 15:43:00 +0000
Subject: Check for potential crasher.

Reported and suggested in [#27687] by Dean Giberson. Couldn't redo crash myself, but better safe than sorry :)
---
 source/blender/collada/ExtraHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source/blender')

diff --git a/source/blender/collada/ExtraHandler.cpp b/source/blender/collada/ExtraHandler.cpp
index a60ef8b2ea5..820665ad757 100644
--- a/source/blender/collada/ExtraHandler.cpp
+++ b/source/blender/collada/ExtraHandler.cpp
@@ -56,7 +56,7 @@ bool ExtraHandler::textData(const char* text, size_t textLength)
 {
 	char buf[1024];
 	
-	if(currentElement.length() == 0) return false;
+	if(currentElement.length() == 0 || currentExtraTags == 0) return false;
 	
 	BLI_snprintf(buf, textLength+1, "%s", text);
 	currentExtraTags->addTag(currentElement, std::string(buf));
-- 
cgit v1.2.3


From 5ac81bfe9c523c2ea0dcbc55bc8454c2e12239e0 Mon Sep 17 00:00:00 2001
From: "Guillermo S. Romero" <gsr.b3d@infernal-iceberg.com>
Date: Tue, 30 Aug 2011 19:38:32 +0000
Subject: SVN maintenance.

---
 source/blender/collada/AnimationExporter.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source/blender')

diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h
index 267ad4be887..d277dad8e8c 100644
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/collada/AnimationExporter.h
@@ -160,4 +160,4 @@ protected:
 	char* extract_transform_name(char *rna_path);
 
 	std::string getObjectBoneName ( Object *ob,const FCurve * fcu);
-};
\ No newline at end of file
+};
-- 
cgit v1.2.3


From c58a0c5eb814db1be08c0e8a4353ad5606a23d30 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 30 Aug 2011 23:08:38 +0000
Subject: catch exception and report an error when failing to write exr files -
 was crashing with debug builds.

---
 source/blender/editors/space_image/image_ops.c     |  2 +-
 .../blender/imbuf/intern/openexr/openexr_api.cpp   | 15 +++++++--
 .../blender/imbuf/intern/openexr/openexr_multi.h   |  4 +--
 source/blender/imbuf/intern/writeimage.c           |  1 -
 source/blender/render/extern/include/RE_pipeline.h |  4 +--
 source/blender/render/intern/source/pipeline.c     | 39 ++++++++++++++++------
 6 files changed, 46 insertions(+), 19 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index d58b78ff6a7..f96a8ea4d84 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1069,7 +1069,7 @@ static void save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI
 			Scene *scene= CTX_data_scene(C);
 			RenderResult *rr= BKE_image_acquire_renderresult(scene, ima);
 			if(rr) {
-				RE_WriteRenderResult(rr, simopts->filepath, simopts->quality);
+				RE_WriteRenderResult(op->reports, rr, simopts->filepath, simopts->quality);
 				ok= TRUE;
 			}
 			else {
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 7b528ed9624..88f6508d356 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -487,7 +487,7 @@ void IMB_exr_add_channel(void *handle, const char *layname, const char *passname
 }
 
 /* only used for writing temp. render results (not image files) */
-void IMB_exr_begin_write(void *handle, const char *filename, int width, int height, int compress)
+int IMB_exr_begin_write(void *handle, const char *filename, int width, int height, int compress)
 {
 	ExrHandle *data= (ExrHandle *)handle;
 	Header header (width, height);
@@ -504,8 +504,17 @@ void IMB_exr_begin_write(void *handle, const char *filename, int width, int heig
 	/* header.lineOrder() = DECREASING_Y; this crashes in windows for file read! */
 	
 	header.insert ("BlenderMultiChannel", StringAttribute ("Blender V2.55.1 and newer"));
-	
-	data->ofile = new OutputFile(filename, header);
+
+	/* avoid crash/abort when we dont have permission to write here */
+	try {
+		data->ofile = new OutputFile(filename, header);
+	}
+	catch (const std::exception &exc) {
+		std::cerr << "IMB_exr_begin_write: ERROR: " << exc.what() << std::endl;
+		data->ofile = NULL;
+	}
+
+	return (data->ofile != NULL);
 }
 
 void IMB_exrtile_begin_write(void *handle, const char *filename, int mipmap, int width, int height, int tilex, int tiley)
diff --git a/source/blender/imbuf/intern/openexr/openexr_multi.h b/source/blender/imbuf/intern/openexr/openexr_multi.h
index 3d95bb7c306..58c5e0f2a3e 100644
--- a/source/blender/imbuf/intern/openexr/openexr_multi.h
+++ b/source/blender/imbuf/intern/openexr/openexr_multi.h
@@ -50,7 +50,7 @@ void *	IMB_exr_get_handle			(void);
 void	IMB_exr_add_channel			(void *handle, const char *layname, const char *passname, int xstride, int ystride, float *rect);
 
 int		IMB_exr_begin_read			(void *handle, const char *filename, int *width, int *height);
-void	IMB_exr_begin_write			(void *handle, const char *filename, int width, int height, int compress);
+int		IMB_exr_begin_write			(void *handle, const char *filename, int width, int height, int compress);
 void	IMB_exrtile_begin_write		(void *handle, const char *filename, int mipmap, int width, int height, int tilex, int tiley);
 
 void	IMB_exr_set_channel			(void *handle, const char *layname, const char *passname, int xstride, int ystride, float *rect);
@@ -75,7 +75,7 @@ void *	IMB_exr_get_handle			(void) {return NULL;}
 void	IMB_exr_add_channel			(void *handle, const char *layname, const char *channame, int xstride, int ystride, float *rect) {  (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
 
 int		IMB_exr_begin_read			(void *handle, const char *filename, int *width, int *height) { (void)handle; (void)filename; (void)width; (void)height; return 0;}
-void	IMB_exr_begin_write			(void *handle, const char *filename, int width, int height, int compress) { (void)handle; (void)filename; (void)width; (void)height; (void)compress; }
+int		IMB_exr_begin_write			(void *handle, const char *filename, int width, int height, int compress) { (void)handle; (void)filename; (void)width; (void)height; (void)compress; return 0;}
 void	IMB_exrtile_begin_write		(void *handle, const char *filename, int mipmap, int width, int height, int tilex, int tiley) { (void)handle; (void)filename; (void)mipmap; (void)width; (void)height; (void)tilex; (void)tiley; }
 
 void	IMB_exr_set_channel			(void *handle, char *layname, const char *channame, int xstride, int ystride, float *rect) { (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c
index cd660e11f26..b933e6d93ee 100644
--- a/source/blender/imbuf/intern/writeimage.c
+++ b/source/blender/imbuf/intern/writeimage.c
@@ -55,7 +55,6 @@ short IMB_saveiff(struct ImBuf *ibuf, const char *name, int flags)
 				if(ibuf->rect==NULL && ibuf->rect_float)
 					IMB_rect_from_float(ibuf);
 			}
-			/* TODO. have const char for image write funcs */
 			return type->save(ibuf, name, flags);
 		}
 	}
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 0736bed4faf..97ffcd95473 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -227,8 +227,8 @@ void RE_SetReports(struct Render *re, struct ReportList *reports);
 /* main preview render call */
 void RE_PreviewRender(struct Render *re, struct Main *bmain, struct Scene *scene);
 
-void RE_ReadRenderResult(struct Scene *scene, struct Scene *scenode);
-void RE_WriteRenderResult(RenderResult *rr, const char *filename, int compress);
+int RE_ReadRenderResult(struct Scene *scene, struct Scene *scenode);
+int RE_WriteRenderResult(struct ReportList *reports, RenderResult *rr, const char *filename, int compress);
 struct RenderResult *RE_MultilayerConvert(void *exrhandle, int rectx, int recty);
 
 extern const float default_envmap_layout[];
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 0d5f8c77f6b..77b637b5129 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -824,11 +824,12 @@ static char *make_pass_name(RenderPass *rpass, int chan)
 
 /* filename already made absolute */
 /* called from within UI, saves both rendered result as a file-read result */
-void RE_WriteRenderResult(RenderResult *rr, const char *filename, int compress)
+int RE_WriteRenderResult(ReportList *reports, RenderResult *rr, const char *filename, int compress)
 {
 	RenderLayer *rl;
 	RenderPass *rpass;
 	void *exrhandle= IMB_exr_get_handle();
+	int success;
 
 	BLI_make_existing_file(filename);
 	
@@ -864,11 +865,20 @@ void RE_WriteRenderResult(RenderResult *rr, const char *filename, int compress)
 			}
 		}
 	}
-	
-	IMB_exr_begin_write(exrhandle, filename, rr->rectx, rr->recty, compress);
-	
-	IMB_exr_write_channels(exrhandle);
+
+	/* when the filename has no permissions, this can fail */
+	if(IMB_exr_begin_write(exrhandle, filename, rr->rectx, rr->recty, compress)) {
+		IMB_exr_write_channels(exrhandle);
+		success= TRUE;
+	}
+	else {
+		/* TODO, get the error from openexr's exception */
+		BKE_report(reports, RPT_ERROR, "Error Writing Render Result, see console");
+		success= FALSE;
+	}
 	IMB_exr_close(exrhandle);
+
+	return success;
 }
 
 /* callbacks for RE_MultilayerConvert */
@@ -992,9 +1002,10 @@ static int read_render_result_from_file(const char *filename, RenderResult *rr)
 }
 
 /* only for temp buffer files, makes exact copy of render result */
-static void read_render_result(Render *re, int sample)
+static int read_render_result(Render *re, int sample)
 {
 	char str[FILE_MAX];
+	int success;
 
 	BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
 
@@ -1004,10 +1015,18 @@ static void read_render_result(Render *re, int sample)
 	render_unique_exr_name(re, str, sample);
 	printf("read exr tmp file: %s\n", str);
 
-	if(!read_render_result_from_file(str, re->result))
+	if(read_render_result_from_file(str, re->result)) {
+		success= TRUE;
+	}
+	else {
 		printf("cannot read: %s\n", str);
+		success= FALSE;
+
+	}
 
 	BLI_rw_mutex_unlock(&re->resultmutex);
+
+	return success;
 }
 
 /* *************************************************** */
@@ -2981,7 +3000,7 @@ static int do_write_image_or_movie(Render *re, Scene *scene, bMovieHandle *mh, c
 		
 		if(re->r.imtype==R_MULTILAYER) {
 			if(re->result) {
-				RE_WriteRenderResult(re->result, name, scene->r.quality);
+				RE_WriteRenderResult(re->reports, re->result, name, scene->r.quality);
 				printf("Saved: %s", name);
 			}
 		}
@@ -3198,7 +3217,7 @@ void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
 /* note; repeated win/disprect calc... solve that nicer, also in compo */
 
 /* only the temp file! */
-void RE_ReadRenderResult(Scene *scene, Scene *scenode)
+int RE_ReadRenderResult(Scene *scene, Scene *scenode)
 {
 	Render *re;
 	int winx, winy;
@@ -3232,7 +3251,7 @@ void RE_ReadRenderResult(Scene *scene, Scene *scenode)
 	RE_InitState(re, NULL, &scene->r, NULL, winx, winy, &disprect);
 	re->scene= scene;
 	
-	read_render_result(re, 0);
+	return read_render_result(re, 0);
 }
 
 void RE_set_max_threads(int threads)
-- 
cgit v1.2.3


From 2883e035c87a4236629d9a89ea0a6e80b525e7d3 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 30 Aug 2011 23:37:46 +0000
Subject: fix for error in my recent change to image save. - relative path
 wasn't being made absolute. - saving renders was always defaulting to
 multilayer exr, now use the output format set.

---
 source/blender/editors/space_image/image_ops.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index f96a8ea4d84..68f9e4d033e 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -960,20 +960,19 @@ static int save_image_options_init(SaveImageOptions *simopts, SpaceImage *sima,
 
 	if(ibuf) {
 		Image *ima= sima->image;
-		RenderResult *rr= BKE_image_acquire_renderresult(scene, ima);
 
 		simopts->planes= ibuf->depth;
 
-		/* cant save multilayer sequence, ima->rr isn't valid for a specific frame */
-		if(rr && !(ima->source==IMA_SRC_SEQUENCE && ima->type==IMA_TYPE_MULTILAYER))
-			simopts->imtype= R_MULTILAYER;
-		else if(ima->type==IMA_TYPE_R_RESULT)
+		if(ELEM(ima->type, IMA_TYPE_R_RESULT, IMA_TYPE_COMPOSITE)) {
 			simopts->imtype= scene->r.imtype;
-		else if (ima->source == IMA_SRC_GENERATED)
+			simopts->planes= scene->r.planes;
+		}
+		else if (ima->source == IMA_SRC_GENERATED) {
 			simopts->imtype= R_PNG;
-		else
+		}
+		else {
 			simopts->imtype= BKE_ftype_to_imtype(ibuf->ftype);
-
+		}
 		simopts->subimtype= scene->r.subimtype; /* XXX - this is lame, we need to make these available too! */
 		simopts->quality= ibuf->ftype & 0xff;
 
@@ -1000,8 +999,6 @@ static int save_image_options_init(SaveImageOptions *simopts, SpaceImage *sima,
 			}
 			BLI_path_abs(simopts->filepath, G.main->name);
 		}
-		/* cleanup */
-		BKE_image_release_renderresult(scene, ima);
 	}
 
 	ED_space_image_release_buffer(sima, lock);
@@ -1016,7 +1013,10 @@ static void save_image_options_from_op(SaveImageOptions *simopts, wmOperator *op
 	// if (RNA_property_is_set(op->ptr, "subimtype")) simopts->subimtype= RNA_enum_get(op->ptr, "subimtype"); // XXX
 	if (RNA_property_is_set(op->ptr, "file_quality")) simopts->quality= RNA_int_get(op->ptr, "file_quality");
 
-	if (RNA_property_is_set(op->ptr, "filepath")) RNA_string_get(op->ptr, "filepath", simopts->filepath);
+	if (RNA_property_is_set(op->ptr, "filepath")) {
+		RNA_string_get(op->ptr, "filepath", simopts->filepath);
+		BLI_path_abs(simopts->filepath, G.main->name);
+	}
 }
 
 static void save_image_options_to_op(SaveImageOptions *simopts, wmOperator *op)
-- 
cgit v1.2.3


From 79249f8aede5c5481c625335b5ef7bd9b4cf28cc Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 31 Aug 2011 01:05:40 +0000
Subject: fix [#28430] Image with Stampinfo does not get saved correctly with
 alpha

---
 source/blender/blenfont/intern/blf_font.c |  9 ++++++++-
 source/blender/blenpluginapi/iff.h        |  2 +-
 source/blender/imbuf/IMB_imbuf.h          |  2 +-
 source/blender/imbuf/intern/rectop.c      | 10 +++++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 708b3708ab7..fb6505fe935 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -213,7 +213,7 @@ void blf_font_buffer(FontBLF *font, const char *str)
 {
 	unsigned char *cbuf;
 	unsigned int c;
-	unsigned char b_col_char[3];
+	unsigned char b_col_char[4];
 	GlyphBLF *g, *g_prev;
 	FT_Vector delta;
 	FT_UInt glyph_index;
@@ -232,6 +232,7 @@ void blf_font_buffer(FontBLF *font, const char *str)
 	b_col_char[0]= font->b_col[0] * 255;
 	b_col_char[1]= font->b_col[1] * 255;
 	b_col_char[2]= font->b_col[2] * 255;
+	b_col_char[3]= font->b_col[3] * 255;
 
 	while (str[i]) {
 		int pen_y;
@@ -296,16 +297,19 @@ void blf_font_buffer(FontBLF *font, const char *str)
 						a= *(g->bitmap + x + (yb * g->pitch)) / 255.0f;
 
 						if(a > 0.0f) {
+							float alphatest;
 							fbuf= font->b_fbuf + font->bch * ((chx + x) + ((pen_y + y)*font->bw));
 							if (a >= 1.0f) {
 								fbuf[0]= font->b_col[0];
 								fbuf[1]= font->b_col[1];
 								fbuf[2]= font->b_col[2];
+								fbuf[3]= (alphatest= (fbuf[3] + (font->b_col[3]))) < 1.0f ? alphatest : 1.0f;
 							}
 							else {
 								fbuf[0]= (font->b_col[0]*a) + (fbuf[0] * (1-a));
 								fbuf[1]= (font->b_col[1]*a) + (fbuf[1] * (1-a));
 								fbuf[2]= (font->b_col[2]*a) + (fbuf[2] * (1-a));
+								fbuf[3]= (alphatest= (fbuf[3] + (font->b_col[3]*a))) < 1.0f ? alphatest : 1.0f;
 							}
 						}
 					}
@@ -324,16 +328,19 @@ void blf_font_buffer(FontBLF *font, const char *str)
 						a= *(g->bitmap + x + (yb * g->pitch)) / 255.0f;
 
 						if(a > 0.0f) {
+							int alphatest;
 							cbuf= font->b_cbuf + font->bch * ((chx + x) + ((pen_y + y)*font->bw));
 							if (a >= 1.0f) {
 								cbuf[0]= b_col_char[0];
 								cbuf[1]= b_col_char[1];
 								cbuf[2]= b_col_char[2];
+								cbuf[3]= (alphatest= ((int)cbuf[3] + (int)b_col_char[3])) < 255 ? alphatest : 255;
 							}
 							else {
 								cbuf[0]= (b_col_char[0]*a) + (cbuf[0] * (1-a));
 								cbuf[1]= (b_col_char[1]*a) + (cbuf[1] * (1-a));
 								cbuf[2]= (b_col_char[2]*a) + (cbuf[2] * (1-a));
+								cbuf[3]= (alphatest= ((int)cbuf[3] + (int)((font->b_col[3]*a)*255.0f))) < 255 ? alphatest : 255;
 							}
 						}
 					}
diff --git a/source/blender/blenpluginapi/iff.h b/source/blender/blenpluginapi/iff.h
index 77cdf889ea5..d29853f7d15 100644
--- a/source/blender/blenpluginapi/iff.h
+++ b/source/blender/blenpluginapi/iff.h
@@ -115,7 +115,7 @@ LIBIMPORT void IMB_rectcpy(struct ImBuf *dbuf, struct ImBuf *sbuf,
 
 LIBIMPORT void IMB_rectfill(struct ImBuf *drect, const float col[4]);
 LIBIMPORT void IMB_rectfill_area(struct ImBuf *ibuf, float *col, int x1, int y1, int x2, int y2);
-LIBIMPORT void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, float *col, int x1, int y1, int x2, int y2);
+LIBIMPORT void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, const float col[4], int x1, int y1, int x2, int y2);
 LIBIMPORT void IMB_rectfill_alpha(struct ImBuf *drect, const float value);
 
 #endif /* IFF_H */
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 1fbe8e01fd4..2c926f2d94b 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -499,7 +499,7 @@ void IMB_rectfill_area(struct ImBuf *ibuf, float *col, int x1, int y1, int x2, i
 void IMB_rectfill_alpha(struct ImBuf *ibuf, const float value);
 
 /* this should not be here, really, we needed it for operating on render data, IMB_rectfill_area calls it */
-void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, float *col, int x1, int y1, int x2, int y2);
+void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, const float col[4], int x1, int y1, int x2, int y2);
 
 /* defined in metadata.c */
 int IMB_metadata_change_field(struct ImBuf *img, const char *key, const char *field);
diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c
index 844478e03cb..db2ae3a5114 100644
--- a/source/blender/imbuf/intern/rectop.c
+++ b/source/blender/imbuf/intern/rectop.c
@@ -482,7 +482,7 @@ void IMB_rectfill(struct ImBuf *drect, const float col[4])
 }
 
 
-void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, float *col, int x1, int y1, int x2, int y2)
+void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, const float col[4], int x1, int y1, int x2, int y2)
 {
 	int i, j;
 	float a; /* alpha */
@@ -509,6 +509,8 @@ void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height,
 		unsigned char *pixel; 
 		unsigned char chr=0, chg=0, chb=0;
 		float fr=0, fg=0, fb=0;
+
+		const int alphaint= FTOCHAR(a);
 		
 		if (a == 1.0f) {
 			chr = FTOCHAR(col[0]);
@@ -527,10 +529,13 @@ void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height,
 						pixel[0] = chr;
 						pixel[1] = chg;
 						pixel[2] = chb;
+						pixel[3] = 255;
 					} else {
+						int alphatest;
 						pixel[0] = (char)((fr + ((float)pixel[0]*aich))*255.0f);
 						pixel[1] = (char)((fg + ((float)pixel[1]*aich))*255.0f);
 						pixel[2] = (char)((fb + ((float)pixel[2]*aich))*255.0f);
+						pixel[3] = (char)((alphatest= ((int)pixel[3] + alphaint)) < 255 ? alphatest : 255);
 					}
 				}
 			}
@@ -546,10 +551,13 @@ void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height,
 					pixel[0] = col[0];
 					pixel[1] = col[1];
 					pixel[2] = col[2];
+					pixel[3] = 1.0f;
 				} else {
+					float alphatest;
 					pixel[0] = (col[0]*a) + (pixel[0]*ai);
 					pixel[1] = (col[1]*a) + (pixel[1]*ai);
 					pixel[2] = (col[2]*a) + (pixel[2]*ai);
+					pixel[3] = (alphatest= (pixel[3] + a)) < 1.0f ? alphatest : 1.0f;
 				}
 			}
 		}
-- 
cgit v1.2.3


From 471c005137540dd4c348c2f8e93146c0dff37a3f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 31 Aug 2011 01:07:55 +0000
Subject: typo fix: end of lines ;; --> ;

---
 source/blender/blenkernel/intern/collision.c      | 2 +-
 source/blender/blenlib/intern/math_matrix.c       | 2 +-
 source/blender/editors/space_logic/logic_window.c | 2 +-
 source/blender/editors/space_view3d/view3d_edit.c | 2 +-
 source/blender/python/intern/bpy_intern_string.c  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index e2a1b0dfb33..a63e91cc8be 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -1091,7 +1091,7 @@ static int cloth_collision_response_moving ( ClothModifierData *clmd, CollisionM
 				
 				VECADDMUL(cloth1->verts[collpair->ap1].impulse, pimpulse, w1*2.0);
 				VECADDMUL(cloth1->verts[collpair->ap2].impulse, pimpulse, w2*2.0);
-				VECADDMUL(cloth1->verts[collpair->ap3].impulse, pimpulse, w3*2.0);;
+				VECADDMUL(cloth1->verts[collpair->ap3].impulse, pimpulse, w3*2.0);
 				cloth1->verts[collpair->ap1].impulse_count++;
 				cloth1->verts[collpair->ap2].impulse_count++;
 				cloth1->verts[collpair->ap3].impulse_count++;
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c
index 5edf6e28d4c..3c79a77707a 100644
--- a/source/blender/blenlib/intern/math_matrix.c
+++ b/source/blender/blenlib/intern/math_matrix.c
@@ -820,7 +820,7 @@ void normalize_m4_m4(float rmat[][4], float mat[][4])
 	len= normalize_v3_v3(rmat[1], mat[1]);
 	if(len!=0.0f) rmat[1][3]= mat[1][3] / len;
 	len= normalize_v3_v3(rmat[2], mat[2]);
-	if(len!=0.0f) rmat[2][3]= mat[2][3] / len;;
+	if(len!=0.0f) rmat[2][3]= mat[2][3] / len;
 }
 
 void adjoint_m3_m3(float m1[][3], float m[][3])
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c
index 882d89fcd33..920e93cc0fc 100644
--- a/source/blender/editors/space_logic/logic_window.c
+++ b/source/blender/editors/space_logic/logic_window.c
@@ -3677,7 +3677,7 @@ static void draw_actuator_action(uiLayout *layout, PointerRNA *ptr)
 {
 	Object *ob = (Object *)ptr->id.data;
 	PointerRNA settings_ptr;
-	uiLayout *row, *subrow, *col;;
+	uiLayout *row, *subrow, *col;
 
 	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
 
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index e9ed5dac3de..19e8d42db2d 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -3475,7 +3475,7 @@ void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float *dist)
 		copy_m3_m4(nmat, mat);
 		normalize_m3(nmat);
 
-		mul_m3_v3(nmat, vec);;
+		mul_m3_v3(nmat, vec);
 		sub_v3_v3(ofs, vec);
 	}
 }
diff --git a/source/blender/python/intern/bpy_intern_string.c b/source/blender/python/intern/bpy_intern_string.c
index 6fc861b2a0d..7c80653496f 100644
--- a/source/blender/python/intern/bpy_intern_string.c
+++ b/source/blender/python/intern/bpy_intern_string.c
@@ -40,7 +40,7 @@ PyObject *bpy_intern_str___slots__;
 void bpy_intern_string_init(void)
 {
 	bpy_intern_str_register= PyUnicode_FromString("register");
-	bpy_intern_str_unregister= PyUnicode_FromString("unregister");;
+	bpy_intern_str_unregister= PyUnicode_FromString("unregister");
 	bpy_intern_str_bl_rna= PyUnicode_FromString("bl_rna");
 	bpy_intern_str_order= PyUnicode_FromString("order");
 	bpy_intern_str_attr= PyUnicode_FromString("attr");
-- 
cgit v1.2.3


From d0d82c69e96e96845a59ad625900a94187dac621 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Wed, 31 Aug 2011 09:37:14 +0000
Subject: COLLADA: Take parent bone length and direction instead of using bone
 pointing up with length 1. Looks much nicer and less confusing on larger
 armatures now.

---
 source/blender/collada/ArmatureImporter.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index 1e7879b352f..2ec8ae540d2 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -310,9 +310,10 @@ void ArmatureImporter::fix_leaf_bones( )
 		LeafBone& leaf = *it;
 
 		// pointing up
-		float vec[3] = {0.0f, 0.0f, 1.0f};
+		float vec[3] = {0.0f, 0.0f, 0.1f};
 		
-		//mul_v3_fl(vec, leaf_bone_length);
+		// if parent: take parent length and direction
+		if(leaf.bone->parent) sub_v3_v3v3(vec, leaf.bone->parent->tail, leaf.bone->parent->head);
 
 		copy_v3_v3(leaf.bone->tail, leaf.bone->head);
 		add_v3_v3v3(leaf.bone->tail, leaf.bone->head, vec);
-- 
cgit v1.2.3


From fde215025eff7f3581435bfdb90fb9d354538d07 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 31 Aug 2011 10:43:22 +0000
Subject: patch [#28218] During-render callback functionality from Jesse
 Kaukonen (gekko)

--- text from the patch.

Recently Campbell Barton added callback functionality for Python's usage, but this only includes pre- and post-render callbacks. There are no callbacks for the duration of the render. This patch adds the few lines required for executing a callback while Blender Render is working. The callback resides in the rendering pipeline stats function, so whenever statistics are printed, the callback is executed. This functionality is required if one wants to:

1) Observe what is happening while Blender is rendering via the command line
2) Add custom statistics that Blender prints while the renderer works
3) The user wants to continue executing his Python script without the code halting at bpy.ops.render.render()

Personally I'm currently using this for printing out more detailed progress reports at Renderfarm.fi (such as CPU time, time spent rendering, total progress in regards to the entire rendering process). Tested on Windows, Linux and OS X.

Example on how to use the callback:

  def statscall(context): print("Thanks for calling!")
  bpy.app.handlers.render_stats.append(statscall)
  bpy.ops.render.render(animation=False, write_still=True)
---
 source/blender/blenlib/BLI_callbacks.h          | 1 +
 source/blender/python/intern/bpy_app_handlers.c | 5 +++--
 source/blender/render/intern/source/pipeline.c  | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenlib/BLI_callbacks.h b/source/blender/blenlib/BLI_callbacks.h
index 1735848e774..f20cef9c3ea 100644
--- a/source/blender/blenlib/BLI_callbacks.h
+++ b/source/blender/blenlib/BLI_callbacks.h
@@ -42,6 +42,7 @@ struct ID;
 typedef enum {
 	BLI_CB_EVT_RENDER_PRE,
 	BLI_CB_EVT_RENDER_POST,
+	BLI_CB_EVT_RENDER_STATS,
 	BLI_CB_EVT_LOAD_PRE,
 	BLI_CB_EVT_LOAD_POST,
 	BLI_CB_EVT_SAVE_PRE,
diff --git a/source/blender/python/intern/bpy_app_handlers.c b/source/blender/python/intern/bpy_app_handlers.c
index 26d9ca76e3f..e7e46160199 100644
--- a/source/blender/python/intern/bpy_app_handlers.c
+++ b/source/blender/python/intern/bpy_app_handlers.c
@@ -42,9 +42,10 @@ static PyTypeObject BlenderAppCbType;
 static PyStructSequence_Field app_cb_info_fields[]= {
 	{(char *)"render_pre", NULL},
 	{(char *)"render_post", NULL},
-    {(char *)"load_pre", NULL},
+	{(char *)"render_stats", NULL},
+	{(char *)"load_pre", NULL},
 	{(char *)"load_post", NULL},
-    {(char *)"save_pre", NULL},
+	{(char *)"save_pre", NULL},
 	{(char *)"save_post", NULL},
 	{NULL}
 };
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 77b637b5129..24c55332bff 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -173,6 +173,9 @@ static void stats_background(void *UNUSED(arg), RenderStats *rs)
 		else
 			fprintf(stdout, "Sce: %s Ve:%d Fa:%d La:%d", rs->scenename, rs->totvert, rs->totface, rs->totlamp);
 	}
+
+	BLI_exec_cb(rs, (ID *)rs, BLI_CB_EVT_RENDER_STATS);
+
 	fputc('\n', stdout);
 	fflush(stdout);
 }
-- 
cgit v1.2.3


From a22dc764bbb68bf05ddfd567c27229fbf1a63271 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 1 Sep 2011 01:13:50 +0000
Subject: fix for error in patch from r39821.

---
 source/blender/render/intern/source/pipeline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source/blender')

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 24c55332bff..68190014041 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -174,7 +174,7 @@ static void stats_background(void *UNUSED(arg), RenderStats *rs)
 			fprintf(stdout, "Sce: %s Ve:%d Fa:%d La:%d", rs->scenename, rs->totvert, rs->totface, rs->totlamp);
 	}
 
-	BLI_exec_cb(rs, (ID *)rs, BLI_CB_EVT_RENDER_STATS);
+	BLI_exec_cb(G.main, NULL, BLI_CB_EVT_RENDER_STATS);
 
 	fputc('\n', stdout);
 	fflush(stdout);
-- 
cgit v1.2.3


From 00143a3d557d87dda2bb7074dfe2b1a3acf5f28f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 1 Sep 2011 01:48:50 +0000
Subject: spaces -> tabs (configure you're editors right!)

---
 source/blender/blenkernel/intern/collision.c      |   4 +-
 source/blender/blenlib/intern/math_geom.c         |   2 +-
 source/blender/editors/object/object_bake.c       |   2 +-
 source/blender/editors/space_node/drawnode.c      |   2 +-
 source/blender/editors/space_view3d/view3d_view.c |   4 +-
 source/blender/imbuf/intern/anim_movie.c          |   2 +-
 source/blender/imbuf/intern/indexer_dv.c          | 256 +++++++++++-----------
 source/blender/python/generic/bgl.c               |   6 +-
 source/blender/render/intern/source/pipeline.c    |   6 +-
 source/blender/render/intern/source/zbuf.c        |  14 +-
 10 files changed, 148 insertions(+), 150 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index a63e91cc8be..ed073f03270 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -1487,8 +1487,8 @@ static CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2,
 		
 		sdis = clmd->coll_parms->distance_repel + epsilon2 + FLT_EPSILON;
 		
-		/*apply a repulsion force, to help the solver along.
-          this is kindof crude, it only tests one vert of the triangle*/
+		/* apply a repulsion force, to help the solver along.
+		 * this is kindof crude, it only tests one vert of the triangle */
 		if (isect_ray_plane_v3(cloth->verts[collpair->ap1].tx, n2, collmd->current_xnew[collpair->bp1].co, 
 			collmd->current_xnew[collpair->bp2].co,
 			collmd->current_xnew[collpair->bp3].co, &l, 0))
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index 5b5de3ab3b6..8f025880a86 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -1968,7 +1968,7 @@ void resolve_tri_uv(float uv[2], const float st[2], const float st0[2], const fl
 void resolve_quad_uv(float uv[2], const float st[2], const float st0[2], const float st1[2], const float st2[2], const float st3[2])
 {
 	const double signed_area= (st0[0]*st1[1] - st0[1]*st1[0]) + (st1[0]*st2[1] - st1[1]*st2[0]) +
-                              (st2[0]*st3[1] - st2[1]*st3[0]) + (st3[0]*st0[1] - st3[1]*st0[0]);
+	                          (st2[0]*st3[1] - st2[1]*st3[0]) + (st3[0]*st0[1] - st3[1]*st0[0]);
 
 	/* X is 2D cross product (determinant)
 	   A= (p0-p) X (p0-p3)*/
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index ee162464c70..07c006a7995 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -159,7 +159,7 @@ typedef struct {
 static void multiresbake_get_normal(const MResolvePixelData *data, float norm[], const int face_num, const int vert_index)
 {
 	unsigned int indices[]= {data->mface[face_num].v1, data->mface[face_num].v2,
-                             data->mface[face_num].v3, data->mface[face_num].v4};
+	                         data->mface[face_num].v3, data->mface[face_num].v4};
 	const int smoothnormal= (data->mface[face_num].flag & ME_SMOOTH);
 
 	if(!smoothnormal)  { /* flat */
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index c32d05e9c30..0474d1f3bb1 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -1385,7 +1385,7 @@ static void node_texture_set_butfunc(bNodeType *ntype)
 		default:
 			ntype->uifunc= NULL;
 	}
-        if (ntype->uifuncbut == NULL) ntype->uifuncbut = ntype->uifunc;
+	if (ntype->uifuncbut == NULL) ntype->uifuncbut = ntype->uifunc;
 }
 
 /* ******* init draw callbacks for all tree types, only called in usiblender.c, once ************* */
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index c48459108eb..44ae6837aa2 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -625,8 +625,8 @@ void ED_view3d_win_to_3d(ARegion *ar, const float depth_pt[3], const float mval[
 		}
 	}
 	else {
-        const float dx= (2.0f * mval[0] / (float)ar->winx) - 1.0f;
-        const float dy= (2.0f * mval[1] / (float)ar->winy) - 1.0f;
+		const float dx= (2.0f * mval[0] / (float)ar->winx) - 1.0f;
+		const float dy= (2.0f * mval[1] / (float)ar->winy) - 1.0f;
 		line_sta[0]= (rv3d->persinv[0][0] * dx) + (rv3d->persinv[1][0] * dy) + rv3d->viewinv[3][0];
 		line_sta[1]= (rv3d->persinv[0][1] * dx) + (rv3d->persinv[1][1] * dy) + rv3d->viewinv[3][1];
 		line_sta[2]= (rv3d->persinv[0][2] * dx) + (rv3d->persinv[1][2] * dy) + rv3d->viewinv[3][2];
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 7b172008bee..c4fe1523e90 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -922,7 +922,7 @@ static int ffmpeg_decode_video_frame(struct anim * anim)
 static void ffmpeg_decode_video_frame_scan(
 	struct anim * anim, int64_t pts_to_search)
 {
-        /* there seem to exist *very* silly GOP lengths out in the wild... */
+	/* there seem to exist *very* silly GOP lengths out in the wild... */
 	int count = 1000;
 
 	av_log(anim->pFormatCtx,
diff --git a/source/blender/imbuf/intern/indexer_dv.c b/source/blender/imbuf/intern/indexer_dv.c
index 2def0d042b7..d1202136d56 100644
--- a/source/blender/imbuf/intern/indexer_dv.c
+++ b/source/blender/imbuf/intern/indexer_dv.c
@@ -30,8 +30,8 @@
 #include <time.h>
 
 typedef struct indexer_dv_bitstream {
-        unsigned char* buffer;
-        int bit_pos;
+	unsigned char* buffer;
+	int bit_pos;
 } indexer_dv_bitstream;
 
 static indexer_dv_bitstream bitstream_new(unsigned char* buffer_) 
@@ -57,41 +57,41 @@ static unsigned long bitstream_get_bits(indexer_dv_bitstream * This, int num)
 }
 
 static int parse_num(indexer_dv_bitstream * b, int numbits) {
-        return bitstream_get_bits(b, numbits);
+	return bitstream_get_bits(b, numbits);
 }
 
 static int parse_bcd(indexer_dv_bitstream * b, int n) 
 {
-        char s[256];
+	char s[256];
 	char * p = s + (n+3)/4;
 
 	*p-- = 0;
 
-        while (n > 4) {
-                char a;
-                int v = bitstream_get_bits(b, 4);
+	while (n > 4) {
+		char a;
+		int v = bitstream_get_bits(b, 4);
 
-                n -= 4;
+		n -= 4;
 		a = '0' + v;
 
-                if (a > '9') {
-			bitstream_get_bits(b, n); 
+		if (a > '9') {
+			bitstream_get_bits(b, n);
 			return -1;
-                }
+		}
 
 		*p-- = a;
-        }
-        if (n) {
-                char a;
-                int v = bitstream_get_bits(b, n);
-                a = '0' + v;
-                if (a > '9') {
+	}
+	if (n) {
+		char a;
+		int v = bitstream_get_bits(b, n);
+		a = '0' + v;
+		if (a > '9') {
 			return -1;
-                }
-                *p-- = a;
-        }
+		}
+		*p-- = a;
+	}
 
-        return atol(s);
+	return atol(s);
 }
 
 typedef struct indexer_dv_context
@@ -125,124 +125,124 @@ typedef struct indexer_dv_context
 
 static void parse_packet(indexer_dv_context * This, unsigned char * p)
 {
-        indexer_dv_bitstream b;
-        int type = p[0];
+	indexer_dv_bitstream b;
+	int type = p[0];
 
 	b = bitstream_new(p + 1);
 
-        switch (type) {
-        case 0x62: // Record date
-                parse_num(&b, 8);
-                This->rec_curr_day = parse_bcd(&b, 6);
-                parse_num(&b, 2);
-                This->rec_curr_month = parse_bcd(&b, 5);
-                parse_num(&b, 3);
-                This->rec_curr_year = parse_bcd(&b, 8);
-                if (This->rec_curr_year < 25) {
-                        This->rec_curr_year += 2000;
-                } else {
-                        This->rec_curr_year += 1900;
-                }
-                This->got_record_date = 1;
-                break;
-        case 0x63: // Record time
-                This->rec_curr_frame = parse_bcd(&b, 6);
-                parse_num(&b, 2);
-                This->rec_curr_second = parse_bcd(&b, 7);
-                parse_num(&b, 1);
-                This->rec_curr_minute = parse_bcd(&b, 7);
-                parse_num(&b, 1);
-                This->rec_curr_hour = parse_bcd(&b, 6);
-                This->got_record_time = 1;
-                break;
-        }
+	switch (type) {
+		case 0x62: // Record date
+			parse_num(&b, 8);
+			This->rec_curr_day = parse_bcd(&b, 6);
+			parse_num(&b, 2);
+			This->rec_curr_month = parse_bcd(&b, 5);
+			parse_num(&b, 3);
+			This->rec_curr_year = parse_bcd(&b, 8);
+			if (This->rec_curr_year < 25) {
+				This->rec_curr_year += 2000;
+			} else {
+				This->rec_curr_year += 1900;
+			}
+			This->got_record_date = 1;
+			break;
+		case 0x63: // Record time
+			This->rec_curr_frame = parse_bcd(&b, 6);
+			parse_num(&b, 2);
+			This->rec_curr_second = parse_bcd(&b, 7);
+			parse_num(&b, 1);
+			This->rec_curr_minute = parse_bcd(&b, 7);
+			parse_num(&b, 1);
+			This->rec_curr_hour = parse_bcd(&b, 6);
+			This->got_record_time = 1;
+			break;
+	}
 }
 
 static void parse_header_block(indexer_dv_context * This, unsigned char* target)
 {
 	int i;
-        for (i = 3; i < 80; i += 5) {
-                  if (target[i] != 0xff) {
-                          parse_packet(This, target + i);
-                  }
-        }
+	for (i = 3; i < 80; i += 5) {
+		if (target[i] != 0xff) {
+			parse_packet(This, target + i);
+		}
+	}
 }
 
 static void parse_subcode_blocks(
-	indexer_dv_context * This, unsigned char* target)
+        indexer_dv_context * This, unsigned char* target)
 {
 	int i,j;
 
-        for (j = 0; j < 2; j++) {
-                for (i = 3; i < 80; i += 5) {
-                        if (target[i] != 0xff) {
-                                parse_packet(This, target + i);
-                        }
-                }
-        }
+	for (j = 0; j < 2; j++) {
+		for (i = 3; i < 80; i += 5) {
+			if (target[i] != 0xff) {
+				parse_packet(This, target + i);
+			}
+		}
+	}
 }
 
 static void parse_vaux_blocks(
-	indexer_dv_context * This, unsigned char* target)
+        indexer_dv_context * This, unsigned char* target)
 {
 	int i,j;
 
-        for (j = 0; j < 3; j++) {
-                for (i = 3; i < 80; i += 5) {
-                        if (target[i] != 0xff) {
-                                parse_packet(This, target + i);
-                        }
-                }
-                target += 80;
-        }
+	for (j = 0; j < 3; j++) {
+		for (i = 3; i < 80; i += 5) {
+			if (target[i] != 0xff) {
+				parse_packet(This, target + i);
+			}
+		}
+		target += 80;
+	}
 }
 
 static void parse_audio_headers(
-	indexer_dv_context * This, unsigned char* target)
+        indexer_dv_context * This, unsigned char* target)
 {
 	int i;
 
-        for(i = 0; i < 9; i++) {
-                if (target[3] != 0xff) {
-                        parse_packet(This, target + 3);
-                }
-                target += 16 * 80;
-        }
+	for(i = 0; i < 9; i++) {
+		if (target[3] != 0xff) {
+			parse_packet(This, target + 3);
+		}
+		target += 16 * 80;
+	}
 }
 
 static void parse_frame(indexer_dv_context * This, 
-			unsigned char * framebuffer, int isPAL)
+                        unsigned char * framebuffer, int isPAL)
 {
-        int numDIFseq = isPAL ? 12 : 10;
-        unsigned char* target = framebuffer;
+	int numDIFseq = isPAL ? 12 : 10;
+	unsigned char* target = framebuffer;
 	int ds;
 
-        for (ds = 0; ds < numDIFseq; ds++) { 
-                parse_header_block(This, target);
-                target +=   1 * 80;
-                parse_subcode_blocks(This, target);
-                target +=   2 * 80;
-                parse_vaux_blocks(This, target);
-                target +=   3 * 80;
-                parse_audio_headers(This, target);
-                target += 144 * 80;
-        }
+	for (ds = 0; ds < numDIFseq; ds++) {
+		parse_header_block(This, target);
+		target +=   1 * 80;
+		parse_subcode_blocks(This, target);
+		target +=   2 * 80;
+		parse_vaux_blocks(This, target);
+		target +=   3 * 80;
+		parse_audio_headers(This, target);
+		target += 144 * 80;
+	}
 }
 
 static void inc_frame(int * frame, time_t * t, int isPAL)
 {
-        if ((isPAL && *frame >= 25) || (!isPAL && *frame >= 30)) {
-                fprintf(stderr, "Ouchie: inc_frame: invalid_frameno: %d\n",
-			*frame);
-        }
-        (*frame)++;
-        if (isPAL && *frame >= 25) {
-                (*t)++;
-                *frame = 0;
-        } else if (!isPAL && *frame >= 30) {
-                (*t)++;
-                *frame = 0;
-        }
+	if ((isPAL && *frame >= 25) || (!isPAL && *frame >= 30)) {
+		fprintf(stderr, "Ouchie: inc_frame: invalid_frameno: %d\n",
+		        *frame);
+	}
+	(*frame)++;
+	if (isPAL && *frame >= 25) {
+		(*t)++;
+		*frame = 0;
+	} else if (!isPAL && *frame >= 30) {
+		(*t)++;
+		*frame = 0;
+	}
 }
 
 static void write_index(indexer_dv_context * This, anim_index_entry * entry)
@@ -256,36 +256,36 @@ static void fill_gap(indexer_dv_context * This, int isPAL)
 {
 	int i;
 
-        for (i = 0; i < This->fsize; i++) {
-                if (This->gap_start == This->ref_time_read && 
-		    This->gap_frame == This->curr_frame) {
-                        fprintf(stderr, 
-				"indexer_dv::fill_gap: "
-				"can't seek backwards !\n");
-                        break;
-                }
-                inc_frame(&This->gap_frame, &This->gap_start, isPAL);
-        }
-
-        while (This->gap_start != This->ref_time_read || 
+	for (i = 0; i < This->fsize; i++) {
+		if (This->gap_start == This->ref_time_read &&
+		        This->gap_frame == This->curr_frame) {
+			fprintf(stderr,
+			        "indexer_dv::fill_gap: "
+			        "can't seek backwards !\n");
+			break;
+		}
+		inc_frame(&This->gap_frame, &This->gap_start, isPAL);
+	}
+
+	while (This->gap_start != This->ref_time_read ||
 	       This->gap_frame != This->curr_frame) {
-                inc_frame(&This->gap_frame, &This->gap_start, isPAL);
+		inc_frame(&This->gap_frame, &This->gap_start, isPAL);
 		This->frameno_offset++;
-        }
+	}
 
-        for (i = 0; i < This->fsize; i++) {
+	for (i = 0; i < This->fsize; i++) {
 		write_index(This, This->backbuffer + i);
-        }
-        This->fsize = 0;
+	}
+	This->fsize = 0;
 }
 
 static void proc_frame(indexer_dv_context * This,
-		       unsigned char* UNUSED(framebuffer), int isPAL)
+                       unsigned char* UNUSED(framebuffer), int isPAL)
 {
 	struct tm recDate;
 	time_t t;
 
-        if (!This->got_record_date || !This->got_record_time) {
+	if (!This->got_record_date || !This->got_record_time) {
 		return;
 	}
 
@@ -329,9 +329,9 @@ static void proc_frame(indexer_dv_context * This,
 }
 
 static void indexer_dv_proc_frame(anim_index_builder * idx, 
-				  unsigned char * buffer,
-				  int UNUSED(data_size),
-				  struct anim_index_entry * entry)
+                                  unsigned char * buffer,
+                                  int UNUSED(data_size),
+                                  struct anim_index_entry * entry)
 {
 	int isPAL;
 	
@@ -354,7 +354,7 @@ static void indexer_dv_proc_frame(anim_index_builder * idx,
 			int i;
 
 			fprintf(stderr, "indexer_dv::indexer_dv_proc_frame: "
-				"backbuffer overrun, emergency flush");
+			        "backbuffer overrun, emergency flush");
 
 			for (i = 0; i < This->fsize; i++) {
 				write_index(This, This->backbuffer+i);
@@ -378,8 +378,8 @@ static void indexer_dv_delete(anim_index_builder * idx)
 
 void IMB_indexer_dv_new(anim_index_builder * idx)
 {
-	indexer_dv_context * rv = MEM_callocN( 
-		sizeof(indexer_dv_context), "index_dv builder context");
+	indexer_dv_context * rv = MEM_callocN(
+	            sizeof(indexer_dv_context), "index_dv builder context");
 
 	rv->ref_time_read = -1;
 	rv->curr_frame = -1;
diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c
index 09432e0b316..ae8069cf3c5 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -52,11 +52,9 @@ static int Buffer_len(Buffer *self);
 static PyObject *Buffer_item(Buffer *self, int i);
 static PyObject *Buffer_slice(Buffer *self, int begin, int end);
 static int Buffer_ass_item(Buffer *self, int i, PyObject *v);
-static int Buffer_ass_slice(Buffer *self, int begin, int end,
-                            PyObject *seq);
+static int Buffer_ass_slice(Buffer *self, int begin, int end, PyObject *seq);
 static PyObject *Buffer_subscript(Buffer *self, PyObject *item);
-static int Buffer_ass_subscript(Buffer *self, PyObject *item,
-                                PyObject *value);
+static int Buffer_ass_subscript(Buffer *self, PyObject *item, PyObject *value);
 
 static PySequenceMethods Buffer_SeqMethods = {
 	(lenfunc) Buffer_len,						/*sq_length */
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 68190014041..49e5e7b989d 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -641,9 +641,9 @@ static RenderResult *new_render_result(Render *re, rcti *partrct, int crop, int
 			render_layer_add_pass(rr, rl, 3, SCE_PASS_REFRACT);
 		if(srl->passflag  & SCE_PASS_INDEXOB)
 			render_layer_add_pass(rr, rl, 1, SCE_PASS_INDEXOB);
-                if(srl->passflag  & SCE_PASS_INDEXMA)
-                        render_layer_add_pass(rr, rl, 1, SCE_PASS_INDEXMA);
-                if(srl->passflag  & SCE_PASS_MIST)
+		if(srl->passflag  & SCE_PASS_INDEXMA)
+			render_layer_add_pass(rr, rl, 1, SCE_PASS_INDEXMA);
+		if(srl->passflag  & SCE_PASS_MIST)
 			render_layer_add_pass(rr, rl, 1, SCE_PASS_MIST);
 		if(rl->passflag & SCE_PASS_RAYHITS)
 			render_layer_add_pass(rr, rl, 4, SCE_PASS_RAYHITS);
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index 04e4ce2c647..925f8529dfa 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -4115,13 +4115,13 @@ unsigned short *zbuffer_transp_shade(RenderPart *pa, RenderLayer *rl, float *pas
 							add_transp_obindex(rlpp[a], od, obr->ob);
 					}
 				}
-                                if(addpassflag & SCE_PASS_INDEXMA) {
-                                        ObjectRen *obr= R.objectinstance[zrow[totface-1].obi].obr;
-                                        if(obr->ob) {
-                                                for(a= 0; a<totfullsample; a++)
-                                                        add_transp_obindex(rlpp[a], od, obr->ob);
-                                        }
-                                }
+				if(addpassflag & SCE_PASS_INDEXMA) {
+					ObjectRen *obr= R.objectinstance[zrow[totface-1].obi].obr;
+					if(obr->ob) {
+						for(a= 0; a<totfullsample; a++)
+							add_transp_obindex(rlpp[a], od, obr->ob);
+					}
+				}
 
 				/* for each mask-sample we alpha-under colors. then in end it's added using filter */
 				memset(samp_shr, 0, sizeof(ShadeResult)*osa);
-- 
cgit v1.2.3


From 473292dcd7f0f51b91316fc59cdf7d97d11435a5 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 1 Sep 2011 09:46:07 +0000
Subject: fix for building without audaspace, since pepper merge

---
 source/blender/blenkernel/intern/sound.c | 12 ++++++++++++
 source/blender/editors/sound/sound_ops.c | 17 +++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index cdb509ab8e1..50a7b4a7a73 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -760,5 +760,17 @@ void sound_seek_scene(struct bContext *UNUSED(C)) {}
 float sound_sync_scene(struct Scene *UNUSED(scene)) { return 0.0f; }
 int sound_scene_playing(struct Scene *UNUSED(scene)) { return -1; }
 int sound_read_sound_buffer(struct bSound* UNUSED(sound), float* UNUSED(buffer), int UNUSED(length), float UNUSED(start), float UNUSED(end)) { return 0; }
+void sound_read_waveform(struct bSound* sound) { (void)sound; }
+void sound_init_main(struct Main *bmain) { (void)bmain; }
+void sound_set_cfra(int cfra) { (void)cfra; }
+void sound_update_sequencer(struct Main* main, struct bSound* sound) { (void)main; (void)sound; }
+void sound_update_scene(struct Scene* scene) { (void)scene; }
+void sound_update_scene_sound(void* handle, struct bSound* sound) { (void)handle; (void)sound; }
+void sound_update_scene_listener(struct Scene *scene) { (void)scene; }
+void sound_update_fps(struct Scene *scene) { (void)scene; }
+void sound_set_scene_sound_volume(void* handle, float volume, char animated) { (void)handle; (void)volume; (void)animated; }
+void sound_set_scene_sound_pan(void* handle, float pan, char animated) { (void)handle; (void)pan; (void)animated; }
+void sound_set_scene_volume(struct Scene *scene, float volume) { (void)scene; (void)volume; }
+void sound_set_scene_sound_pitch(void* handle, float pitch, char animated) { (void)handle; (void)pitch; (void)animated; }
 
 #endif // WITH_AUDASPACE
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index e66abffbfd1..70884d47c23 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -221,6 +221,7 @@ void SOUND_OT_open_mono(wmOperatorType *ot)
 
 static int mixdown_exec(bContext *C, wmOperator *op)
 {
+#ifdef WITH_AUDASPACE
 	char path[FILE_MAX];
 	char filename[FILE_MAX];
 	Scene *scene;
@@ -254,7 +255,10 @@ static int mixdown_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_ERROR, result);
 		return OPERATOR_CANCELLED;
 	}
-
+#else // WITH_AUDASPACE
+	(void)C;
+	(void)op;
+#endif // WITH_AUDASPACE
 	return OPERATOR_FINISHED;
 }
 
@@ -278,6 +282,7 @@ static int mixdown_draw_check_prop(PropertyRNA *prop)
 	);
 }
 
+#ifdef WITH_AUDASPACE
 static void mixdown_draw(bContext *C, wmOperator *op)
 {
 	static EnumPropertyItem pcm_format_items[] = {
@@ -429,9 +434,11 @@ static void mixdown_draw(bContext *C, wmOperator *op)
 	/* main draw call */
 	uiDefAutoButsRNA(layout, &ptr, mixdown_draw_check_prop, '\0');
 }
+#endif // WITH_AUDASPACE
 
 void SOUND_OT_mixdown(wmOperatorType *ot)
 {
+#ifdef WITH_AUDASPACE
 	static EnumPropertyItem format_items[] = {
 		{AUD_FORMAT_U8, "U8", 0, "U8", "8 bit unsigned"},
 		{AUD_FORMAT_S16, "S16", 0, "S16", "16 bit signed"},
@@ -469,6 +476,8 @@ void SOUND_OT_mixdown(wmOperatorType *ot)
 		{AUD_CODEC_VORBIS, "VORBIS", 0, "Vorbis", "Xiph.Org Vorbis Codec"},
 		{0, NULL, 0, NULL, NULL}};
 
+#endif // WITH_AUDASPACE
+
 	/* identifiers */
 	ot->name= "Mixdown";
 	ot->description= "Mixes the scene's audio to a sound file";
@@ -477,18 +486,22 @@ void SOUND_OT_mixdown(wmOperatorType *ot)
 	/* api callbacks */
 	ot->exec= mixdown_exec;
 	ot->invoke= mixdown_invoke;
-	ot->ui= mixdown_draw;
 
+#ifdef WITH_AUDASPACE
+	ot->ui= mixdown_draw;
+#endif
 	/* flags */
 	ot->flag= OPTYPE_REGISTER;
 
 	/* properties */
 	WM_operator_properties_filesel(ot, FOLDERFILE|SOUNDFILE, FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH);
+#ifdef WITH_AUDASPACE
 	RNA_def_int(ot->srna, "accuracy", 1024, 1, 16777216, "Accuracy", "Sample accuracy. Important for animation data. The lower the value, the more accurate.", 1, 16777216);
 	RNA_def_enum(ot->srna, "container", container_items, AUD_CONTAINER_FLAC, "Container", "File format");
 	RNA_def_enum(ot->srna, "codec", codec_items, AUD_CODEC_FLAC, "Codec", "Audio Codec");
 	RNA_def_enum(ot->srna, "format", format_items, AUD_FORMAT_S16, "Format", "Sample format");
 	RNA_def_int(ot->srna, "bitrate", 192, 32, 512, "Bitrate", "Bitrate in kbit/s", 32, 512);
+#endif // WITH_AUDASPACE
 }
 
 /* ******************************************************* */
-- 
cgit v1.2.3


From a8e49cd55a9cb5ca43dfb3d97c4ad0968a469b45 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 1 Sep 2011 09:47:21 +0000
Subject: use a fixed 32byte buffer for getting an rna string from python.
 gives a slight speedup when drawing heavy UI's

---
 source/blender/python/intern/bpy_rna.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index e1c38a82142..6de3c040c18 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -1298,7 +1298,9 @@ PyObject *pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop)
 	{
 		int subtype= RNA_property_subtype(prop);
 		const char *buf;
-		buf= RNA_property_string_get_alloc(ptr, prop, NULL, -1);
+		char buf_fixed[32];
+
+		buf= RNA_property_string_get_alloc(ptr, prop, buf_fixed, sizeof(buf_fixed));
 #ifdef USE_STRING_COERCE
 		/* only file paths get special treatment, they may contain non utf-8 chars */
 		if(ELEM3(subtype, PROP_FILEPATH, PROP_DIRPATH, PROP_FILENAME)) {
@@ -1310,7 +1312,9 @@ PyObject *pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop)
 #else // USE_STRING_COERCE
 		ret= PyUnicode_FromString(buf);
 #endif // USE_STRING_COERCE
-		MEM_freeN((void *)buf);
+		if(buf_fixed != buf) {
+			MEM_freeN((void *)buf);
+		}
 		break;
 	}
 	case PROP_ENUM:
-- 
cgit v1.2.3


From 1f7b41775bcc8832355c13785c299156a870c749 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 2 Sep 2011 03:32:57 +0000
Subject: minor warning fixes, also correct some float -> double promotions in
 shadeoutput.c

---
 source/blender/blenkernel/intern/nla.c            |  4 +++-
 source/blender/blenkernel/intern/sound.c          |  2 ++
 source/blender/render/intern/source/shadeoutput.c | 28 +++++++++++------------
 3 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index 25f824bba19..53ccd55bde8 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -341,7 +341,7 @@ NlaStrip *add_nlastrip_to_stack (AnimData *adt, bAction *act)
 }
 
 /* Add a NLA Strip referencing the given speaker's sound */
-NlaStrip *add_nla_soundstrip (Scene *scene, Speaker *speaker)
+NlaStrip *add_nla_soundstrip (Scene *UNUSED(scene), Speaker *speaker)
 {
 	NlaStrip *strip = MEM_callocN(sizeof(NlaStrip), "NlaSoundStrip");
 	
@@ -359,6 +359,8 @@ NlaStrip *add_nla_soundstrip (Scene *scene, Speaker *speaker)
 #endif
 	{
 		strip->end = 10.0f;
+		/* quiet compiler warnings */
+		(void)speaker;
 	}
 	
 	/* general settings */
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 50a7b4a7a73..74f4830b86c 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -39,8 +39,10 @@
 #include "BKE_sequencer.h"
 #include "BKE_scene.h"
 
+#ifdef WITH_AUDASPACE
 // evil global ;-)
 static int sound_cfra;
+#endif
 
 struct bSound* sound_new_file(struct Main *bmain, const char *filename)
 {
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index 7f921d21041..30632586b04 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -282,10 +282,10 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens)
 		else if(ok1==0 || ok2==0) return;
 		
 		/* at least 1 visible interesction point */
-		if(t1<0.0f && t2<0.0f) return;
+		if(t1<0.0 && t2<0.0) return;
 		
-		if(t1<0.0f) t1= 0.0f;
-		if(t2<0.0f) t2= 0.0f;
+		if(t1<0.0) t1= 0.0;
+		if(t2<0.0) t2= 0.0;
 		
 		if(t1==t2) return;
 		
@@ -423,8 +423,8 @@ float fresnel_fac(float *view, float *vn, float grad, float fac)
 
 static double saacos_d(double fac)
 {
-	if(fac<= -1.0f) return M_PI;
-	else if(fac>=1.0f) return 0.0;
+	if(fac<= -1.0) return M_PI;
+	else if(fac>=1.0) return 0.0;
 	else return acos(fac);
 }
 
@@ -590,7 +590,7 @@ static float CookTorr_Spec(float *n, float *l, float *v, int hard, int tangent)
 
 	i= spec(nh, hard);
 
-	i= i/(0.1+nv);
+	i= i/(0.1f+nv);
 	return i;
 }
 
@@ -896,7 +896,7 @@ static void ramp_diffuse_result(float *diff, ShadeInput *shi)
 	if(ma->ramp_col) {
 		if(ma->rampin_col==MA_RAMP_IN_RESULT) {
 			
-			fac= 0.3*diff[0] + 0.58*diff[1] + 0.12*diff[2];
+			fac= 0.3f*diff[0] + 0.58f*diff[1] + 0.12f*diff[2];
 			do_colorband(ma->ramp_col, fac, col);
 			
 			/* blending method */
@@ -926,7 +926,7 @@ static void add_to_diffuse(float *diff, ShadeInput *shi, float is, float r, floa
 			/* input */
 			switch(ma->rampin_col) {
 			case MA_RAMP_IN_ENERGY:
-				fac= 0.3*r + 0.58*g + 0.12*b;
+				fac= 0.3f*r + 0.58f*g + 0.12f*b;
 				break;
 			case MA_RAMP_IN_SHADER:
 				fac= is;
@@ -966,7 +966,7 @@ static void ramp_spec_result(float *specr, float *specg, float *specb, ShadeInpu
 	float fac;
 	
 	if(ma->ramp_spec && (ma->rampin_spec==MA_RAMP_IN_RESULT)) {
-		fac= 0.3*(*specr) + 0.58*(*specg) + 0.12*(*specb);
+		fac= 0.3f*(*specr) + 0.58f*(*specg) + 0.12f*(*specb);
 		do_colorband(ma->ramp_spec, fac, col);
 		
 		/* blending method */
@@ -1213,7 +1213,7 @@ float lamp_get_visibility(LampRen *lar, float *co, float *lv, float *dist)
 				}
 			}
 		}
-		if (visifac <= 0.001) visifac = 0.0f;
+		if (visifac <= 0.001f) visifac = 0.0f;
 		return visifac;
 	}
 }
@@ -1231,7 +1231,7 @@ static void shade_one_light(LampRen *lar, ShadeInput *shi, ShadeResult *shr, int
 	view= shi->view;
 	
 	
-	if (lar->energy == 0.0) return;
+	if (lar->energy == 0.0f) return;
 	/* only shadow lamps shouldn't affect shadow-less materials at all */
 	if ((lar->mode & LA_ONLYSHADOW) && (!(ma->mode & MA_SHADOW) || !(R.r.mode & R_SHADOW)))
 		return;
@@ -1359,7 +1359,7 @@ static void shade_one_light(LampRen *lar, ShadeInput *shi, ShadeResult *shr, int
 	
 	/* 'is' is diffuse */
 	if((ma->shade_flag & MA_CUBIC) && is>0.0f && is<1.0f)
-		is= 3.0*is*is - 2.0*is*is*is;	// nicer termination of shades
+		is= 3.0f*is*is - 2.0f*is*is*is;	// nicer termination of shades
 
 	i= is*phongcorr;
 	
@@ -1388,7 +1388,7 @@ static void shade_one_light(LampRen *lar, ShadeInput *shi, ShadeResult *shr, int
 						lamp_get_shadow(lar, shi, inp, shadfac, shi->depth);
 						
 					/* warning, here it skips the loop */
-					if((lar->mode & LA_ONLYSHADOW) && i>0.0) {
+					if((lar->mode & LA_ONLYSHADOW) && i>0.0f) {
 						
 						shadfac[3]= i*lar->energy*(1.0f-shadfac[3]);
 						shr->shad[0] -= shadfac[3]*shi->r*(1.0f-lashdw[0]);
@@ -1448,7 +1448,7 @@ static void shade_one_light(LampRen *lar, ShadeInput *shi, ShadeResult *shr, int
 				t= vn[0]*lv[0]+vn[1]*lv[1]+vn[2]*lv[2];
 				
 				if(lar->type==LA_HEMI) {
-					t= 0.5*t+0.5;
+					t= 0.5f*t+0.5f;
 				}
 				
 				t= shadfac[3]*shi->spec*spec(t, shi->har);
-- 
cgit v1.2.3


From dc463db6c27242af464140582bc6708802d601e8 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 2 Sep 2011 03:42:16 +0000
Subject: Credits generator which cross references with the patch tracker to
 credit the original authors.

the script has a unix-name <> real-name mapping which is not totally complete since I couldn't find everyones real names.

In this case the commit name is credited.

Also added a link to the credits page in the splash.
---
 source/blender/windowmanager/intern/wm_operators.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index a4efa8fff84..c053022681b 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1259,11 +1259,12 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
 	split = uiLayoutSplit(layout, 0, 0);
 	col = uiLayoutColumn(split, 0);
 	uiItemL(col, "Links", ICON_NONE);
-	uiItemStringO(col, "Donations", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/blenderorg/blender-foundation/donation-payment/");
-	uiItemStringO(col, "Release Log", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/development/release-logs/blender-259/");
+	uiItemStringO(col, "Donations", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/blenderorg/blender-foundation/donation-payment");
+	uiItemStringO(col, "Credits", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/development/credits");
+	uiItemStringO(col, "Release Log", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/development/release-logs/blender-259");
 	uiItemStringO(col, "Manual", ICON_URL, "WM_OT_url_open", "url", "http://wiki.blender.org/index.php/Doc:2.5/Manual");
-	uiItemStringO(col, "Blender Website", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/");
-	uiItemStringO(col, "User Community", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/community/user-community/"); // 
+	uiItemStringO(col, "Blender Website", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org");
+	uiItemStringO(col, "User Community", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/community/user-community");
 	if(strcmp(STRINGIFY(BLENDER_VERSION_CYCLE), "release")==0) {
 		BLI_snprintf(url, sizeof(url), "http://www.blender.org/documentation/blender_python_api_%d_%d" STRINGIFY(BLENDER_VERSION_CHAR) "_release", BLENDER_VERSION/100, BLENDER_VERSION%100);
 	}
-- 
cgit v1.2.3


From dc7f56455c8a6e045a7a8ab683376ccc91ab8b93 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 2 Sep 2011 04:34:58 +0000
Subject: fix for error in recent commit, when audaspace is enabled

---
 source/blender/blenkernel/intern/nla.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source/blender')

diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index 53ccd55bde8..6ce80342dd6 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -341,7 +341,7 @@ NlaStrip *add_nlastrip_to_stack (AnimData *adt, bAction *act)
 }
 
 /* Add a NLA Strip referencing the given speaker's sound */
-NlaStrip *add_nla_soundstrip (Scene *UNUSED(scene), Speaker *speaker)
+NlaStrip *add_nla_soundstrip (Scene *scene, Speaker *speaker)
 {
 	NlaStrip *strip = MEM_callocN(sizeof(NlaStrip), "NlaSoundStrip");
 	
@@ -360,6 +360,7 @@ NlaStrip *add_nla_soundstrip (Scene *UNUSED(scene), Speaker *speaker)
 	{
 		strip->end = 10.0f;
 		/* quiet compiler warnings */
+		(void)scene;
 		(void)speaker;
 	}
 	
-- 
cgit v1.2.3


From e6ff3df5b980ebda24f14d0d211bb0739aa64f12 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 2 Sep 2011 07:51:19 +0000
Subject: fix for keymap search, was using uninitialized memory when the
 keymaps operator couldn't be found.

---
 source/blender/makesrna/intern/rna_wm.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 93adf808f83..4c07a89a42f 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -680,20 +680,14 @@ static void rna_wmKeyMapItem_name_get(PointerRNA *ptr, char *value)
 {
 	wmKeyMapItem *kmi= ptr->data;
 	wmOperatorType *ot= WM_operatortype_find(kmi->idname, 1);
-	
-	if (ot)
-		strcpy(value, ot->name);
+	strcpy(value, ot ? ot->name : kmi->idname);
 }
 
 static int rna_wmKeyMapItem_name_length(PointerRNA *ptr)
 {
 	wmKeyMapItem *kmi= ptr->data;
 	wmOperatorType *ot= WM_operatortype_find(kmi->idname, 1);
-	
-	if (ot)
-		return strlen(ot->name);
-	else
-		return 0;
+	return strlen(ot ? ot->name : kmi->idname);
 }
 
 static int rna_KeyMapItem_userdefined_get(PointerRNA *ptr)
@@ -1652,7 +1646,9 @@ static void rna_def_keyconfig(BlenderRNA *brna)
 	RNA_def_property_string_funcs(prop, "rna_wmKeyMapItem_idname_get", "rna_wmKeyMapItem_idname_length", "rna_wmKeyMapItem_idname_set");
 	RNA_def_struct_name_property(srna, prop);
 	RNA_def_property_update(prop, 0, "rna_KeyMapItem_update");
-	
+
+	/* this is infact the operator name, but if the operator can't be found we
+	 * fallback on the operator ID */
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Name", "Name of operator to call on input event");
-- 
cgit v1.2.3


From 1d9ddcd319908f6442b02623f7782413ecefa40a Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 2 Sep 2011 08:01:01 +0000
Subject: tweak to WM_operatortype_find to perform better when called with
 empty strings (as the keymap editor does a lot)

---
 source/blender/windowmanager/intern/wm_operators.c | 25 ++++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index c053022681b..0e0203543a4 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -108,21 +108,28 @@ static GHash *global_ops_hash= NULL;
 
 wmOperatorType *WM_operatortype_find(const char *idname, int quiet)
 {
-	wmOperatorType *ot;
-	
-	char idname_bl[OP_MAX_TYPENAME]; // XXX, needed to support python style names without the _OT_ syntax
-	WM_operator_bl_idname(idname_bl, idname);
+	if(idname[0]) {
+		wmOperatorType *ot;
+
+		/* needed to support python style names without the _OT_ syntax */
+		char idname_bl[OP_MAX_TYPENAME];
+		WM_operator_bl_idname(idname_bl, idname);
 
-	if (idname_bl[0]) {
 		ot= BLI_ghash_lookup(global_ops_hash, idname_bl);
 		if(ot) {
 			return ot;
 		}
+
+		if(!quiet) {
+			printf("search for unknown operator '%s', '%s'\n", idname_bl, idname);
+		}
 	}
-	
-	if(!quiet)
-		printf("search for unknown operator %s, %s\n", idname_bl, idname);
-	
+	else {
+		if(!quiet) {
+			printf("search for empty operator\n");
+		}
+	}
+
 	return NULL;
 }
 
-- 
cgit v1.2.3


From 8276989f63267c906fcf933dcf557bc35fa1cb8c Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 2 Sep 2011 08:20:30 +0000
Subject: fix [#28460] SEGFAULT when trying to make empty display as image

---
 source/blender/editors/animation/anim_filter.c | 47 ++++++++++++++------------
 1 file changed, 26 insertions(+), 21 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 8010a41ccb3..bb710a32794 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1177,29 +1177,34 @@ static size_t animfilter_nla (bAnimContext *UNUSED(ac), ListBase *anim_data, bDo
 /* determine what animation data from AnimData block should get displayed */
 static size_t animfilter_block_data (bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, ID *id, int filter_mode)
 {
-	IdAdtTemplate *iat = (IdAdtTemplate*)id;
 	AnimData *adt = BKE_animdata_from_id(id);
 	size_t items = 0;
-	
-	/* NOTE: this macro is used instead of inlining the logic here, since this sort of filtering is still needed 
-	 * in a few places in he rest of the code still - notably for the few cases where special mode-based 
-	 * different types of data expanders are required.
-	 */
-	ANIMDATA_FILTER_CASES(iat,
-		{ /* AnimData */
-			/* specifically filter animdata block */
-			ANIMCHANNEL_NEW_CHANNEL(adt, ANIMTYPE_ANIMDATA, id);
-		},
-		{ /* NLA */
-			items += animfilter_nla(ac, anim_data, ads, adt, filter_mode, id); 
-		},
-		{ /* Drivers */
-			items += animfilter_fcurves(anim_data, ads, adt->drivers.first, NULL, filter_mode, id);
-		},
-		{ /* Keyframes */
-			items += animfilter_action(ac, anim_data, ads, adt->action, filter_mode, id);
-		});
-	
+
+	/* image object datablocks have no anim-data so check for NULL */
+	if(adt) {
+		IdAdtTemplate *iat = (IdAdtTemplate*)id;
+
+		/* NOTE: this macro is used instead of inlining the logic here, since this sort of filtering is still needed
+		 * in a few places in he rest of the code still - notably for the few cases where special mode-based
+		 * different types of data expanders are required.
+		 */
+		ANIMDATA_FILTER_CASES(iat,
+			{ /* AnimData */
+				/* specifically filter animdata block */
+				ANIMCHANNEL_NEW_CHANNEL(adt, ANIMTYPE_ANIMDATA, id);
+			},
+			{ /* NLA */
+				items += animfilter_nla(ac, anim_data, ads, adt, filter_mode, id);
+			},
+			{ /* Drivers */
+				items += animfilter_fcurves(anim_data, ads, adt->drivers.first, NULL, filter_mode, id);
+			},
+			{ /* Keyframes */
+				items += animfilter_action(ac, anim_data, ads, adt->action, filter_mode, id);
+			}
+		);
+	}
+
 	return items;
 }
 
-- 
cgit v1.2.3


From 612e2d4dbe0e8dfe5b4d4fee49040ec38107ada3 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 2 Sep 2011 08:35:46 +0000
Subject: patch [#28473] Outliner Simple Todo from Julien DUROURE (julien)

---

* right click --> rename, as proposed on http://wiki.blender.org/index.php/Dev:2.5/Source/Development/Todo/Simple_Todos

* implementation of Toggle visibility/rendarability/selectability on right click on Groups ( was in menu, but not implemented )
---
 .../blender/editors/space_outliner/outliner_draw.c |  2 +-
 .../blender/editors/space_outliner/outliner_edit.c | 64 ++++++++++++++++------
 .../editors/space_outliner/outliner_intern.h       |  8 +++
 .../editors/space_outliner/outliner_tools.c        | 42 ++++++++++++--
 4 files changed, 94 insertions(+), 22 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 0cb05fa2115..95a315272b9 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -236,7 +236,7 @@ static int group_select_flag(Group *gr)
 	return 0;
 }
 
-static void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag)
+void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag)
 {	
 	Scene *scene = (Scene *)poin;		
 	GroupObject *gob;
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index fbd5281b1d9..2b451a48748 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -218,6 +218,34 @@ void OUTLINER_OT_item_openclose(wmOperatorType *ot)
 
 /* Rename --------------------------------------------------- */
 
+void do_item_rename(ARegion *ar, TreeElement *te, TreeStoreElem *tselem, ReportList *reports)
+{
+	/* can't rename rna datablocks entries */
+	if(ELEM3(tselem->type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM))
+			;
+	else if(ELEM10(tselem->type, TSE_ANIM_DATA, TSE_NLA, TSE_DEFGROUP_BASE, TSE_CONSTRAINT_BASE, TSE_MODIFIER_BASE, TSE_SCRIPT_BASE, TSE_POSE_BASE, TSE_POSEGRP_BASE, TSE_R_LAYER_BASE, TSE_R_PASS)) 
+			BKE_report(reports, RPT_WARNING, "Cannot edit builtin name");
+	else if(ELEM3(tselem->type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP))
+		BKE_report(reports, RPT_WARNING, "Cannot edit sequence name");
+	else if(tselem->id->lib) {
+		// XXX						error_libdata();
+	} 
+	else if(te->idcode == ID_LI && te->parent) {
+		BKE_report(reports, RPT_WARNING, "Cannot edit the path of an indirectly linked library");
+	} 
+	else {
+		tselem->flag |= TSE_TEXTBUT;
+		ED_region_tag_redraw(ar);
+	}
+}
+
+void item_rename_cb(bContext *C, Scene *UNUSED(scene), TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+{
+	ARegion *ar= CTX_wm_region(C);
+	ReportList *reports= CTX_wm_reports(C); // XXX
+	do_item_rename(ar, te, tselem, reports) ;
+}
+
 static int do_outliner_item_rename(bContext *C, ARegion *ar, SpaceOops *soops, TreeElement *te, const float mval[2])
 {	
 	ReportList *reports= CTX_wm_reports(C); // XXX
@@ -228,23 +256,7 @@ static int do_outliner_item_rename(bContext *C, ARegion *ar, SpaceOops *soops, T
 		/* name and first icon */
 		if(mval[0]>te->xs+UI_UNIT_X && mval[0]<te->xend) {
 			
-			/* can't rename rna datablocks entries */
-			if(ELEM3(tselem->type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM))
-			   ;
-			else if(ELEM10(tselem->type, TSE_ANIM_DATA, TSE_NLA, TSE_DEFGROUP_BASE, TSE_CONSTRAINT_BASE, TSE_MODIFIER_BASE, TSE_SCRIPT_BASE, TSE_POSE_BASE, TSE_POSEGRP_BASE, TSE_R_LAYER_BASE, TSE_R_PASS)) 
-					BKE_report(reports, RPT_WARNING, "Cannot edit builtin name");
-			else if(ELEM3(tselem->type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP))
-				BKE_report(reports, RPT_WARNING, "Cannot edit sequence name");
-			else if(tselem->id->lib) {
-				// XXX						error_libdata();
-			} 
-			else if(te->idcode == ID_LI && te->parent) {
-				BKE_report(reports, RPT_WARNING, "Cannot edit the path of an indirectly linked library");
-			} 
-			else {
-				tselem->flag |= TSE_TEXTBUT;
-				ED_region_tag_redraw(ar);
-			}
+			do_item_rename(ar, te, tselem, reports) ;
 		}
 		return 1;
 	}
@@ -377,6 +389,12 @@ void object_toggle_visibility_cb(bContext *C, Scene *scene, TreeElement *te, Tre
 	}
 }
 
+void group_toggle_visibility_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+{
+	Group *group= (Group *)tselem->id;
+	restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_VIEW);
+}
+
 static int outliner_toggle_visibility_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	SpaceOops *soops= CTX_wm_space_outliner(C);
@@ -417,6 +435,12 @@ void object_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene, TreeEleme
 	}
 }
 
+void group_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+{
+	Group *group= (Group *)tselem->id;
+	restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_SELECT);
+}
+
 static int outliner_toggle_selectability_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	SpaceOops *soops= CTX_wm_space_outliner(C);
@@ -457,6 +481,12 @@ void object_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene, TreeEleme
 	}
 }
 
+void group_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+{
+	Group *group= (Group *)tselem->id;
+	restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_RENDER);
+}
+
 static int outliner_toggle_renderability_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	SpaceOops *soops= CTX_wm_space_outliner(C);
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 9da09144125..2ddb5707623 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -139,6 +139,7 @@ void outliner_build_tree(struct Main *mainvar, struct Scene *scene, struct Space
 /* outliner_draw.c ---------------------------------------------- */
 
 void draw_outliner(const struct bContext *C);
+void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag);
 
 /* outliner_select.c -------------------------------------------- */
 int tree_element_type_active(struct bContext *C, struct Scene *scene, struct SpaceOops *soops, TreeElement *te, TreeStoreElem *tselem, int set);
@@ -158,6 +159,13 @@ void object_toggle_visibility_cb(struct bContext *C, struct Scene *scene, TreeEl
 void object_toggle_selectability_cb(struct bContext *C, struct Scene *scene, TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
 void object_toggle_renderability_cb(struct bContext *C, struct Scene *scene, TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
 
+
+void group_toggle_visibility_cb(struct bContext *C, struct Scene *scene, TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
+void group_toggle_selectability_cb(struct bContext *C, struct Scene *scene, TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
+void group_toggle_renderability_cb(struct bContext *C, struct Scene *scene, TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
+
+void item_rename_cb(struct bContext *C, struct Scene *scene, TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
+
 /* ...................................................... */
 
 void OUTLINER_OT_item_activate(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 3ae158bd275..70dfbfe3830 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -510,6 +510,7 @@ static EnumPropertyItem prop_object_op_types[] = {
 	{6, "TOGVIS", 0, "Toggle Visible", ""},
 	{7, "TOGSEL", 0, "Toggle Selectable", ""},
 	{8, "TOGREN", 0, "Toggle Renderable", ""},
+	{9, "RENAME", 0, "Rename", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -567,6 +568,10 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op)
 		str= "Toggle Renderability";
 		WM_event_add_notifier(C, NC_SCENE|ND_OB_RENDER, scene);
 	}
+	else if(event==9) {
+		outliner_do_object_operation(C, scene, soops, &soops->tree, item_rename_cb);
+		str= "Rename Object";
+	}
 
 	ED_undo_push(C, str);
 	
@@ -600,6 +605,7 @@ static EnumPropertyItem prop_group_op_types[] = {
 	{4, "TOGVIS", 0, "Toggle Visible", ""},
 	{5, "TOGSEL", 0, "Toggle Selectable", ""},
 	{6, "TOGREN", 0, "Toggle Renderable", ""},
+	{7, "RENAME", 0, "Rename", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -608,6 +614,7 @@ static int outliner_group_operation_exec(bContext *C, wmOperator *op)
 	Scene *scene= CTX_data_scene(C);
 	SpaceOops *soops= CTX_wm_space_outliner(C);
 	int event;
+	const char *str= NULL;
 	
 	/* check for invalid states */
 	if (soops == NULL)
@@ -617,18 +624,35 @@ static int outliner_group_operation_exec(bContext *C, wmOperator *op)
 	
 	if(event==1) {
 		outliner_do_libdata_operation(C, scene, soops, &soops->tree, unlink_group_cb);
-		ED_undo_push(C, "Unlink group");
+		str= "Unlink group";
 	}
 	else if(event==2) {
 		outliner_do_libdata_operation(C, scene, soops, &soops->tree, id_local_cb);
-		ED_undo_push(C, "Localized Data");
+		str= "Localized Data";
 	}
 	else if(event==3) {
 		outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_linkobs2scene_cb);
-		ED_undo_push(C, "Link Group Objects to Scene");
+		str= "Link Group Objects to Scene";
+	}
+	else if(event==4) {
+		outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_toggle_visibility_cb);
+		str= "Toggle Visibility";
+	}
+	else if(event==5) {
+		outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_toggle_selectability_cb);
+		str= "Toggle Selectability";
+	}
+	else if(event==6) {
+		outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_toggle_renderability_cb);
+		str= "Toggle Renderability";
+	}
+	else if(event==7) {
+		outliner_do_libdata_operation(C, scene, soops, &soops->tree, item_rename_cb);
+		str= "Rename";
 	}
 	
 	
+	ED_undo_push(C, str);
 	WM_event_add_notifier(C, NC_GROUP, NULL);
 	
 	return OPERATOR_FINISHED;
@@ -662,7 +686,8 @@ typedef enum eOutlinerIdOpTypes {
 	OUTLINER_IDOP_SINGLE,
 	
 	OUTLINER_IDOP_FAKE_ADD,
-	OUTLINER_IDOP_FAKE_CLEAR
+	OUTLINER_IDOP_FAKE_CLEAR,
+	OUTLINER_IDOP_RENAME
 } eOutlinerIdOpTypes;
 
 // TODO: implement support for changing the ID-block used
@@ -672,6 +697,7 @@ static EnumPropertyItem prop_id_op_types[] = {
 	{OUTLINER_IDOP_SINGLE, "SINGLE", 0, "Make Single User", ""},
 	{OUTLINER_IDOP_FAKE_ADD, "ADD_FAKE", 0, "Add Fake User", "Ensure datablock gets saved even if it isn't in use (e.g. for motion and material libraries)"},
 	{OUTLINER_IDOP_FAKE_CLEAR, "CLEAR_FAKE", 0, "Clear Fake User", ""},
+	{OUTLINER_IDOP_RENAME, "RENAME", 0, "Rename", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -765,6 +791,14 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
 			ED_undo_push(C, "Clear Fake User");
 		}
 			break;
+		case OUTLINER_IDOP_RENAME:
+			/* rename */
+			outliner_do_libdata_operation(C, scene, soops, &soops->tree, item_rename_cb);
+
+			WM_event_add_notifier(C, NC_ID|NA_EDITED, NULL);
+			ED_undo_push(C, "Rename");
+
+			break;
 			
 		default:
 			// invalid - unhandled
-- 
cgit v1.2.3


From 7a496bfbcf3c5a25d4101cf427ca980327ed3e8a Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Fri, 2 Sep 2011 09:39:21 +0000
Subject: Partial fix for #28441: Tab width in texteditor ignored if used tabs
 as spaces

Scroll to cursor when displaying text datablock was changed.
This behavior was lost in 2.5x.
---
 source/blender/editors/space_text/space_text.c  |  5 +++++
 source/blender/editors/space_text/text_draw.c   | 19 +++++++++++++------
 source/blender/editors/space_text/text_intern.h |  1 +
 source/blender/makesrna/intern/rna_space.c      |  3 ++-
 4 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c
index c7d4d78422e..47f051e1ec4 100644
--- a/source/blender/editors/space_text/space_text.c
+++ b/source/blender/editors/space_text/space_text.c
@@ -154,6 +154,11 @@ static void text_listener(ScrArea *sa, wmNotifier *wmn)
 				case NA_REMOVED:
 					ED_area_tag_redraw(sa);
 					break;
+				case NA_SELECTED:
+					if(st->text && st->text == wmn->reference)
+						text_scroll_to_cursor(st, sa);
+
+					break;
 			}
 
 			break;
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c
index 28230b7a48b..066404f23ba 100644
--- a/source/blender/editors/space_text/text_draw.c
+++ b/source/blender/editors/space_text/text_draw.c
@@ -1821,12 +1821,10 @@ void text_update_character_width(SpaceText *st)
 
 /* Moves the view to the cursor location,
   also used to make sure the view isnt outside the file */
-void text_update_cursor_moved(bContext *C)
+void text_scroll_to_cursor(SpaceText *st, ScrArea *sa)
 {
-	ScrArea *sa= CTX_wm_area(C);
-	SpaceText *st= CTX_wm_space_text(C);
 	Text *text;
-	ARegion *ar;
+	ARegion *ar= NULL;
 	int i, x, winx= 0;
 
 	if(ELEM3(NULL, st, st->text, st->text->curl)) return;
@@ -1834,8 +1832,10 @@ void text_update_cursor_moved(bContext *C)
 	text= st->text;
 
 	for(ar=sa->regionbase.first; ar; ar= ar->next)
-		if(ar->regiontype==RGN_TYPE_WINDOW)
+		if(ar->regiontype==RGN_TYPE_WINDOW) {
 			winx= ar->winx;
+			break;
+		}
 	
 	winx -= TXT_SCROLL_WIDTH;
 
@@ -1844,7 +1844,7 @@ void text_update_cursor_moved(bContext *C)
 	i= txt_get_span(text->lines.first, text->sell);
 	if(st->wordwrap) {
 		int offl, offc;
-		wrap_offset(st, CTX_wm_region(C), text->sell, text->selc, &offl, &offc);
+		wrap_offset(st, ar, text->sell, text->selc, &offl, &offc);
 		i+= offl;
 	}
 
@@ -1865,3 +1865,10 @@ void text_update_cursor_moved(bContext *C)
 	if(st->left <0) st->left= 0;
 }
 
+void text_update_cursor_moved(bContext *C)
+{
+	ScrArea *sa= CTX_wm_area(C);
+	SpaceText *st= CTX_wm_space_text(C);
+
+	text_scroll_to_cursor(st, sa);
+}
diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h
index cb55f41acb5..b34c7815f35 100644
--- a/source/blender/editors/space_text/text_intern.h
+++ b/source/blender/editors/space_text/text_intern.h
@@ -55,6 +55,7 @@ int text_font_width(struct SpaceText *st, const char *str);
 void text_update_line_edited(struct TextLine *line);
 void text_update_edited(struct Text *text);
 void text_update_character_width(struct SpaceText *st);
+void text_scroll_to_cursor(struct SpaceText *st, struct ScrArea *sa);
 void text_update_cursor_moved(struct bContext *C);
 
 	/* TXT_OFFSET used to be 35 when the scrollbar was on the left... */
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 8f3097e5589..7a7debe1bf5 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -591,7 +591,8 @@ static void rna_SpaceTextEditor_text_set(PointerRNA *ptr, PointerRNA value)
 	SpaceText *st= (SpaceText*)(ptr->data);
 
 	st->text= value.data;
-	st->top= 0;
+
+	WM_main_add_notifier(NC_TEXT|NA_SELECTED, st->text);
 }
 
 static void rna_SpaceTextEditor_updateEdited(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
-- 
cgit v1.2.3


From 15afd240e04ef3f220b6133cc920d964dbcfcf85 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 2 Sep 2011 10:43:51 +0000
Subject: paranoid check that RNA string functions set the string, would have
 helped solve keymap search bug. disabled in release mode.

---
 source/blender/makesrna/intern/rna_access.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'source/blender')

diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 0d4e31cdaf2..ad79771416d 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -2216,8 +2216,17 @@ char *RNA_property_string_get_alloc(PointerRNA *ptr, PropertyRNA *prop, char *fi
 	else
 		buf= MEM_mallocN(sizeof(char)*(length+1), "RNA_string_get_alloc");
 
+#ifndef NDEBUG
+	/* safety check to ensure the string is actually set */
+	buf[length]= 255;
+#endif
+
 	RNA_property_string_get(ptr, prop, buf);
 
+#ifndef NDEBUG
+	BLI_assert(buf[length] == '\0');
+#endif
+
 	return buf;
 }
 
-- 
cgit v1.2.3


From 3386563368f1e489a40e86671933af385e4073f9 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Fri, 2 Sep 2011 12:26:57 +0000
Subject: Bugfix [#28435] Key Visual transform and Parenting not working

After reviewing this code, it seems that this case can work after all.
However, several things needed to be tweaked:
1) Removed check which stopped parented objects from getting the
visual keying coordinates determined. This actually wasn't doing
anything, given that this case would never occur as...
2) Tweaked the visualkey_can_use() function to also consider parenting
as a cause for visual-keying to be necessary.
---
 source/blender/editors/animation/keyframing.c | 73 ++++++++++++++-------------
 1 file changed, 38 insertions(+), 35 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 4e87409b7fd..53c9fc4d82c 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -530,6 +530,7 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
 {
 	bConstraint *con= NULL;
 	short searchtype= VISUALKEY_NONE;
+	short has_parent = FALSE;
 	char *identifier= NULL;
 	
 	/* validate data */
@@ -548,6 +549,7 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
 		
 		con= ob->constraints.first;
 		identifier= (char *)RNA_property_identifier(prop);
+		has_parent= (ob->parent != NULL);
 	}
 	else if (ptr->type == &RNA_PoseBone) {
 		/* Pose Channel */
@@ -555,10 +557,11 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
 		
 		con= pchan->constraints.first;
 		identifier= (char *)RNA_property_identifier(prop);
+		has_parent= (pchan->parent != NULL);
 	}
 	
 	/* check if any data to search using */
-	if (ELEM(NULL, con, identifier))
+	if (ELEM(NULL, con, identifier) && (has_parent == FALSE))
 		return 0;
 		
 	/* location or rotation identifiers only... */
@@ -573,7 +576,12 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
 	
 	
 	/* only search if a searchtype and initial constraint are available */
-	if (searchtype && con) {
+	if (searchtype) {
+		/* parent is always matching */
+		if (has_parent)
+			return 1;
+		
+		/* constraints */
 		for (; con; con= con->next) {
 			/* only consider constraint if it is not disabled, and has influence */
 			if (con->flag & CONSTRAINT_DISABLE) continue;
@@ -645,39 +653,34 @@ static float visualkey_get_value (PointerRNA *ptr, PropertyRNA *prop, int array_
 	if (ptr->type == &RNA_Object) {
 		Object *ob= (Object *)ptr->data;
 		
-		/* parented objects are not supported, as the effects of the parent
-		 * are included in the matrix, which kindof beats the point
-		 */
-		if (ob->parent == NULL) {
-			/* only Location or Rotation keyframes are supported now */
-			if (strstr(identifier, "location")) {
-				return ob->obmat[3][array_index];
-			}
-			else if (strstr(identifier, "rotation_euler")) {
-				float eul[3];
-				
-				mat4_to_eulO(eul, ob->rotmode, ob->obmat);
-				return eul[array_index];
-			}
-			else if (strstr(identifier, "rotation_quaternion")) {
-				float trimat[3][3], quat[4];
-				
-				copy_m3_m4(trimat, ob->obmat);
-				mat3_to_quat_is_ok(quat, trimat);
-				
-				return quat[array_index];
-			}
-			else if (strstr(identifier, "rotation_axis_angle")) {
-				float axis[3], angle;
-				
-				mat4_to_axis_angle(axis, &angle, ob->obmat);
-				
-				/* w = 0, x,y,z = 1,2,3 */
-				if (array_index == 0)
-					return angle;
-				else
-					return axis[array_index - 1];
-			}
+		/* only Location or Rotation keyframes are supported now */
+		if (strstr(identifier, "location")) {
+			return ob->obmat[3][array_index];
+		}
+		else if (strstr(identifier, "rotation_euler")) {
+			float eul[3];
+			
+			mat4_to_eulO(eul, ob->rotmode, ob->obmat);
+			return eul[array_index];
+		}
+		else if (strstr(identifier, "rotation_quaternion")) {
+			float trimat[3][3], quat[4];
+			
+			copy_m3_m4(trimat, ob->obmat);
+			mat3_to_quat_is_ok(quat, trimat);
+			
+			return quat[array_index];
+		}
+		else if (strstr(identifier, "rotation_axis_angle")) {
+			float axis[3], angle;
+			
+			mat4_to_axis_angle(axis, &angle, ob->obmat);
+			
+			/* w = 0, x,y,z = 1,2,3 */
+			if (array_index == 0)
+				return angle;
+			else
+				return axis[array_index - 1];
 		}
 	}
 	else if (ptr->type == &RNA_PoseBone) {
-- 
cgit v1.2.3


From 6b4bdf621f2830ceff2c44f871523a312422a338 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Fri, 2 Sep 2011 13:23:44 +0000
Subject: Fix #28467: Crash while deleting objects in outliner too fast

Cleanup tree when handling object delete from outliner.
Prevents handling the same tree item twice when clicking fast.
---
 source/blender/editors/space_outliner/outliner_intern.h | 1 +
 source/blender/editors/space_outliner/outliner_tools.c  | 9 +++++++++
 source/blender/editors/space_outliner/outliner_tree.c   | 6 ++++++
 3 files changed, 16 insertions(+)

(limited to 'source/blender')

diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 2ddb5707623..61507d1ffe5 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -129,6 +129,7 @@ typedef struct TreeElement {
 /* outliner_tree.c ----------------------------------------------- */
 
 void outliner_free_tree(ListBase *lb);
+void outliner_cleanup_tree(struct SpaceOops *soops);
 
 TreeElement *outliner_find_tse(struct SpaceOops *soops, TreeStoreElem *tse);
 TreeElement *outliner_find_id(struct SpaceOops *soops, ListBase *lb, struct ID *id);
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 70dfbfe3830..b3170f9cd1e 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -287,6 +287,8 @@ static void object_delete_cb(bContext *C, Scene *scene, TreeElement *te, TreeSto
 	if(base==NULL) 
 		base= object_in_scene((Object *)tselem->id, scene);
 	if(base) {
+		SpaceOops *soops= CTX_wm_space_outliner(C);
+
 		// check also library later
 		if(scene->obedit==base->object) 
 			ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR|EM_DO_UNDO);
@@ -294,6 +296,13 @@ static void object_delete_cb(bContext *C, Scene *scene, TreeElement *te, TreeSto
 		ED_base_object_free_and_unlink(CTX_data_main(C), scene, base);
 		te->directdata= NULL;
 		tselem->id= NULL;
+
+		/* XXX: tree management normally happens from draw_outliner(), but when
+		        you're clicking to fast on Delete object from context menu in
+		        outliner several mouse events can be handled in one cycle without
+		        handling notifiers/redraw which leads to deleting the same object twice.
+		        cleanup tree here to prevent such cases. */
+		outliner_cleanup_tree(soops);
 	}
 
 }
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 0b07c824f3e..8904dcc360f 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -222,6 +222,12 @@ void outliner_free_tree(ListBase *lb)
 	}
 }
 
+void outliner_cleanup_tree(SpaceOops *soops)
+{
+	outliner_free_tree(&soops->tree);
+	outliner_storage_cleanup(soops);
+}
+
 /* Find ith item from the treestore */
 static TreeElement *outliner_find_tree_element(ListBase *lb, int store_index)
 {
-- 
cgit v1.2.3


From 2fb2075c5b3495fede6980b4f9247f9e89c39d39 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Fri, 2 Sep 2011 15:19:30 +0000
Subject: Fix #28280: Insert Hook wrong index

Use quite easy and stupid approach like it used for shape keys:
re-make editmesh (editcurve or editlattice) before creating index array
for hook or storing vertex index in parenting object.

Even if hook was added in "current" edit mode, it should be re-mapped on
loading edit data because topology could be changed after it was created.
Such kind of re-loading edit structures is the easiest way for now to
update keyindexes to relevant state.

Also, fixed bug with not re-mapping indices for vertex-parented objects.
Really old error, not sure why it wasn't noticed yet.
---
 source/blender/editors/mesh/editmesh.c           |  2 +-
 source/blender/editors/object/object_hook.c      | 21 ++++++++++++++++----
 source/blender/editors/object/object_relations.c | 25 ++++++++++++++++++++----
 3 files changed, 39 insertions(+), 9 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c
index 4377fb03632..e371c346f36 100644
--- a/source/blender/editors/mesh/editmesh.c
+++ b/source/blender/editors/mesh/editmesh.c
@@ -1099,7 +1099,7 @@ void load_editMesh(Scene *scene, Object *obedit)
 		int j;
 
 		for (ob=G.main->object.first; ob; ob=ob->id.next) {
-			if (ob->parent==ob && ELEM(ob->partype, PARVERT1,PARVERT3)) {
+			if (ob->parent==obedit && ELEM(ob->partype, PARVERT1,PARVERT3)) {
 				
 				/* duplicate code from below, make it function later...? */
 				if (!vertMap) {
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index bb32869469a..266556773f0 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -64,6 +64,7 @@
 
 #include "ED_curve.h"
 #include "ED_mesh.h"
+#include "ED_lattice.h"
 #include "ED_screen.h"
 
 #include "WM_types.h"
@@ -292,7 +293,7 @@ static int return_editcurve_indexar(Object *obedit, int *tot, int **indexar, flo
 	return totvert;
 }
 
-static int object_hook_index_array(Object *obedit, int *tot, int **indexar, char *name, float *cent_r)
+static int object_hook_index_array(Scene *scene, Object *obedit, int *tot, int **indexar, char *name, float *cent_r)
 {
 	*indexar= NULL;
 	*tot= 0;
@@ -302,7 +303,12 @@ static int object_hook_index_array(Object *obedit, int *tot, int **indexar, char
 		case OB_MESH:
 		{
 			Mesh *me= obedit->data;
-			EditMesh *em = BKE_mesh_get_editmesh(me);
+			EditMesh *em;
+
+			load_editMesh(scene, obedit);
+			make_editMesh(scene, obedit);
+
+			em = BKE_mesh_get_editmesh(me);
 
 			/* check selected vertices first */
 			if( return_editmesh_indexar(em, tot, indexar, cent_r)) {
@@ -316,10 +322,17 @@ static int object_hook_index_array(Object *obedit, int *tot, int **indexar, char
 		}
 		case OB_CURVE:
 		case OB_SURF:
+			load_editNurb(obedit);
+			make_editNurb(obedit);
+
 			return return_editcurve_indexar(obedit, tot, indexar, cent_r);
 		case OB_LATTICE:
 		{
 			Lattice *lt= obedit->data;
+
+			load_editLatt(obedit);
+			make_editLatt(obedit);
+
 			return return_editlattice_indexar(lt->editlatt->latt, tot, indexar, cent_r);
 		}
 		default:
@@ -427,7 +440,7 @@ static void add_hook_object(Main *bmain, Scene *scene, Object *obedit, Object *o
 	int tot, ok, *indexar;
 	char name[32];
 	
-	ok = object_hook_index_array(obedit, &tot, &indexar, name, cent);
+	ok = object_hook_index_array(scene, obedit, &tot, &indexar, name, cent);
 	
 	if (!ok) return;	// XXX error("Requires selected vertices or active Vertex Group");
 	
@@ -760,7 +773,7 @@ static int object_hook_assign_exec(bContext *C, wmOperator *op)
 	
 	/* assign functionality */
 	
-	if(!object_hook_index_array(ob, &tot, &indexar, name, cent)) {
+	if(!object_hook_index_array(CTX_data_scene(C), ob, &tot, &indexar, name, cent)) {
 		BKE_report(op->reports, RPT_WARNING, "Requires selected vertices or active vertex group");
 		return OPERATOR_CANCELLED;
 	}
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index e9418ca9f9f..b9208e778c7 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -91,6 +91,8 @@
 
 #include "ED_armature.h"
 #include "ED_curve.h"
+#include "ED_lattice.h"
+#include "ED_mesh.h"
 #include "ED_keyframing.h"
 #include "ED_object.h"
 #include "ED_screen.h"
@@ -122,7 +124,12 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 	
 	if(obedit->type==OB_MESH) {
 		Mesh *me= obedit->data;
-		EditMesh *em = BKE_mesh_get_editmesh(me);
+		EditMesh *em;
+
+		load_editMesh(scene, obedit);
+		make_editMesh(scene, obedit);
+
+		em = BKE_mesh_get_editmesh(me);
 
 		eve= em->verts.first;
 		while(eve) {
@@ -140,7 +147,12 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 		BKE_mesh_end_editmesh(me, em);
 	}
 	else if(ELEM(obedit->type, OB_SURF, OB_CURVE)) {
-		ListBase *editnurb= curve_get_editcurve(obedit);
+		ListBase *editnurb;
+
+		load_editNurb(obedit);
+		make_editNurb(obedit);
+
+		editnurb= curve_get_editcurve(obedit);
 		
 		cu= obedit->data;
 
@@ -180,8 +192,13 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 		}
 	}
 	else if(obedit->type==OB_LATTICE) {
-		Lattice *lt= obedit->data;
-		
+		Lattice *lt;
+
+		load_editLatt(obedit);
+		make_editLatt(obedit);
+
+		lt= obedit->data;
+
 		a= lt->editlatt->latt->pntsu*lt->editlatt->latt->pntsv*lt->editlatt->latt->pntsw;
 		bp= lt->editlatt->latt->def;
 		while(a--) {
-- 
cgit v1.2.3


From 87cb3f8519c942e19b20ac2b6bbe82fd28b95b3c Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Fri, 2 Sep 2011 17:58:09 +0000
Subject: Fix crash caused by recently added assert about if string was set
 properly.

Memory Estimate is actually 31 characters length, str[31] is a null-terminator.

Return length of 31 for memory estimate property. Returning proper length
would lead to slowdown because of 2x iteration through vertices.
---
 source/blender/makesrna/intern/rna_fluidsim.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source/blender')

diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c
index 1ba2e32502f..ccb24d7dd9b 100644
--- a/source/blender/makesrna/intern/rna_fluidsim.c
+++ b/source/blender/makesrna/intern/rna_fluidsim.c
@@ -184,7 +184,11 @@ static void rna_DomainFluidSettings_memory_estimate_get(PointerRNA *ptr, char *v
 
 static int rna_DomainFluidSettings_memory_estimate_length(PointerRNA *ptr)
 {
-	return 32;
+#ifdef DISABLE_ELBEEM
+	return 0;
+#else
+	return 31;
+#endif
 }
 
 static char *rna_FluidSettings_path(PointerRNA *ptr)
-- 
cgit v1.2.3


From 5193526aebccceb5fb6420e6a703f9b974247078 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Fri, 2 Sep 2011 18:05:07 +0000
Subject: Add missed notifier when toggling object's force field.

---
 source/blender/editors/object/object_edit.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source/blender')

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 61734bc51a2..79cbfb6574b 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1411,6 +1411,8 @@ static int forcefield_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 	else
 		ob->pd->forcefield = 0;
 	
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, NULL);
+
 	return OPERATOR_FINISHED;
 }
 
-- 
cgit v1.2.3


From 8e3d1084b2a73aaa308ceda7a2e777e3d1990690 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Fri, 2 Sep 2011 19:25:32 +0000
Subject: Fix for grid lines drawing outside of histogram widget.

---
 source/blender/editors/interface/interface_draw.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 76ed9891b8e..2267f04aab4 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -770,7 +770,11 @@ void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol)
 	glColor4f(0.f, 0.f, 0.f, 0.3f);
 	uiSetRoundBox(15);
 	uiDrawBox(GL_POLYGON, rect.xmin-1, rect.ymin-1, rect.xmax+1, rect.ymax+1, 3.0f);
-	
+
+	/* need scissor test, histogram can draw outside of boundary */
+	glGetIntegerv(GL_VIEWPORT, scissor);
+	glScissor(ar->winrct.xmin + (rect.xmin-1), ar->winrct.ymin+(rect.ymin-1), (rect.xmax+1)-(rect.xmin-1), (rect.ymax+1)-(rect.ymin-1));
+
 	glColor4f(1.f, 1.f, 1.f, 0.08f);
 	/* draw grid lines here */
 	for (i=1; i<4; i++) {
@@ -778,10 +782,6 @@ void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol)
 		fdrawline(rect.xmin+(i/4.f)*w, rect.ymin, rect.xmin+(i/4.f)*w, rect.ymax);
 	}
 	
-	/* need scissor test, histogram can draw outside of boundary */
-	glGetIntegerv(GL_VIEWPORT, scissor);
-	glScissor(ar->winrct.xmin + (rect.xmin-1), ar->winrct.ymin+(rect.ymin-1), (rect.xmax+1)-(rect.xmin-1), (rect.ymax+1)-(rect.ymin-1));
-	
 	if (hist->mode == HISTO_MODE_LUMA)
 		histogram_draw_one(1.0, 1.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_luma, res);
 	else {
-- 
cgit v1.2.3


From 0cd5dce245762b3fb3fd195dde3bd9ddaeb48970 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 3 Sep 2011 02:15:49 +0000
Subject: whitespace edits

---
 source/blender/python/intern/bpy_rna.c | 300 ++++++++++++++++-----------------
 1 file changed, 150 insertions(+), 150 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 6de3c040c18..d10c8c843e8 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -4631,28 +4631,28 @@ static PyObject *pyrna_func_call(BPy_FunctionRNA *self, PyObject *args, PyObject
 /* note: tp_base member is set to &PyType_Type on init */
 PyTypeObject pyrna_struct_meta_idprop_Type= {
 	PyVarObject_HEAD_INIT(NULL, 0)
-	"bpy_struct_meta_idprop",	/* tp_name */
-	sizeof(PyHeapTypeObject),		/* tp_basicsize */ // XXX, would be PyTypeObject, but subtypes of Type must be PyHeapTypeObject's
-	0,							/* tp_itemsize */
+	"bpy_struct_meta_idprop",   /* tp_name */
+	sizeof(PyHeapTypeObject),   /* tp_basicsize */ // XXX, would be PyTypeObject, but subtypes of Type must be PyHeapTypeObject's
+	0,                          /* tp_itemsize */
 	/* methods */
-	NULL,						/* tp_dealloc */
+	NULL,                       /* tp_dealloc */
 	NULL,                       /* printfunc tp_print; */
-	NULL,						/* getattrfunc tp_getattr; */
-	NULL,						/* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */ /* deprecated in python 3.0! */
-	NULL,						/* tp_repr */
+	NULL,                       /* getattrfunc tp_getattr; */
+	NULL,                       /* setattrfunc tp_setattr; */
+	NULL,                       /* tp_compare */ /* deprecated in python 3.0! */
+	NULL,                       /* tp_repr */
 
 	/* Method suites for standard classes */
 	NULL,                       /* PyNumberMethods *tp_as_number; */
-	NULL,						/* PySequenceMethods *tp_as_sequence; */
-	NULL,						/* PyMappingMethods *tp_as_mapping; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
 
 	/* More standard operations (here for binary compatibility) */
-	NULL,						/* hashfunc tp_hash; */
-	NULL,						/* ternaryfunc tp_call; */
-	NULL,						/* reprfunc tp_str; */
-	NULL /*(getattrofunc) pyrna_struct_meta_idprop_getattro*/,	/* getattrofunc tp_getattro; */
-	(setattrofunc) pyrna_struct_meta_idprop_setattro,	/* setattrofunc tp_setattro; */
+	NULL,                       /* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL /*(getattrofunc) pyrna_struct_meta_idprop_getattro*/, /* getattrofunc tp_getattro; */
+	(setattrofunc) pyrna_struct_meta_idprop_setattro, /* setattrofunc tp_setattro; */
 
 	/* Functions to access object as input/output buffer */
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
@@ -4660,7 +4660,7 @@ PyTypeObject pyrna_struct_meta_idprop_Type= {
   /*** Flags to define presence of optional/expanded features ***/
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,         /* long tp_flags; */
 
-	NULL,						/*  char *tp_doc;  Documentation string */
+	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
 	/* call function for all accessible objects */
 	NULL,                       /* traverseproc tp_traverse; */
@@ -4670,7 +4670,7 @@ PyTypeObject pyrna_struct_meta_idprop_Type= {
 
   /***  Assigned meaning in release 2.1 ***/
   /*** rich comparisons ***/
-	NULL,	/* richcmpfunc tp_richcompare; */
+	NULL,                       /* richcmpfunc tp_richcompare; */
 
   /***  weak reference enabler ***/
 	0,                          /* long tp_weaklistoffset; */
@@ -4681,9 +4681,9 @@ PyTypeObject pyrna_struct_meta_idprop_Type= {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMethodDef *tp_methods; */
 	NULL,                       /* struct PyMemberDef *tp_members; */
-	NULL,						/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct PyGetSetDef *tp_getset; */
 	NULL,                       /* struct _typeobject *tp_base; */
 	NULL,                       /* PyObject *tp_dict; */
 	NULL,                       /* descrgetfunc tp_descr_get; */
@@ -4691,7 +4691,7 @@ PyTypeObject pyrna_struct_meta_idprop_Type= {
 	0,                          /* long tp_dictoffset; */
 	NULL,                       /* initproc tp_init; */
 	NULL,                       /* allocfunc tp_alloc; */
-	NULL,						/* newfunc tp_new; */
+	NULL,                       /* newfunc tp_new; */
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
 	/* For PyObject_IS_GC */
@@ -4709,45 +4709,45 @@ PyTypeObject pyrna_struct_meta_idprop_Type= {
 /*-----------------------BPy_StructRNA method def------------------------------*/
 PyTypeObject pyrna_struct_Type= {
 	PyVarObject_HEAD_INIT(NULL, 0)
-	"bpy_struct",			/* tp_name */
-	sizeof(BPy_StructRNA),	/* tp_basicsize */
-	0,			/* tp_itemsize */
+	"bpy_struct",               /* tp_name */
+	sizeof(BPy_StructRNA),      /* tp_basicsize */
+	0,                          /* tp_itemsize */
 	/* methods */
 	(destructor) pyrna_struct_dealloc,/* tp_dealloc */
 	NULL,                       /* printfunc tp_print; */
-	NULL,						/* getattrfunc tp_getattr; */
-	NULL,						/* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */ /* DEPRECATED in python 3.0! */
-	(reprfunc) pyrna_struct_repr,	/* tp_repr */
+	NULL,                       /* getattrfunc tp_getattr; */
+	NULL,                       /* setattrfunc tp_setattr; */
+	NULL,                       /* tp_compare */ /* DEPRECATED in python 3.0! */
+	(reprfunc) pyrna_struct_repr, /* tp_repr */
 
 	/* Method suites for standard classes */
 
 	NULL,                       /* PyNumberMethods *tp_as_number; */
-	&pyrna_struct_as_sequence,	/* PySequenceMethods *tp_as_sequence; */
-	&pyrna_struct_as_mapping,	/* PyMappingMethods *tp_as_mapping; */
+	&pyrna_struct_as_sequence,  /* PySequenceMethods *tp_as_sequence; */
+	&pyrna_struct_as_mapping,   /* PyMappingMethods *tp_as_mapping; */
 
 	/* More standard operations (here for binary compatibility) */
 
-	(hashfunc) pyrna_struct_hash,	/* hashfunc tp_hash; */
-	NULL,						/* ternaryfunc tp_call; */
+	(hashfunc) pyrna_struct_hash, /* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
 	(reprfunc) pyrna_struct_str, /* reprfunc tp_str; */
-	(getattrofunc) pyrna_struct_getattro,	/* getattrofunc tp_getattro; */
-	(setattrofunc) pyrna_struct_setattro,	/* setattrofunc tp_setattro; */
+	(getattrofunc) pyrna_struct_getattro, /* getattrofunc tp_getattro; */
+	(setattrofunc) pyrna_struct_setattro, /* setattrofunc tp_setattro; */
 
 	/* Functions to access object as input/output buffer */
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,         /* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* long tp_flags; */
 
-	NULL,						/*  char *tp_doc;  Documentation string */
+	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
 	/* call function for all accessible objects */
 #ifdef USE_PYRNA_STRUCT_REFERENCE
-	(traverseproc) pyrna_struct_traverse,                       /* traverseproc tp_traverse; */
+	(traverseproc) pyrna_struct_traverse, /* traverseproc tp_traverse; */
 
 	/* delete references to contained objects */
-	(inquiry)pyrna_struct_clear,                       /* inquiry tp_clear; */
+	(inquiry)pyrna_struct_clear, /* inquiry tp_clear; */
 #else
 	NULL,                       /* traverseproc tp_traverse; */
 
@@ -4757,11 +4757,11 @@ PyTypeObject pyrna_struct_Type= {
 
   /***  Assigned meaning in release 2.1 ***/
   /*** rich comparisons ***/
-	(richcmpfunc)pyrna_struct_richcmp,	/* richcmpfunc tp_richcompare; */
+	(richcmpfunc)pyrna_struct_richcmp, /* richcmpfunc tp_richcompare; */
 
   /***  weak reference enabler ***/
 #ifdef USE_WEAKREFS
-	offsetof(BPy_StructRNA, in_weakreflist),	/* long tp_weaklistoffset; */
+	offsetof(BPy_StructRNA, in_weakreflist), /* long tp_weaklistoffset; */
 #else
 	0,
 #endif
@@ -4771,9 +4771,9 @@ PyTypeObject pyrna_struct_Type= {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	pyrna_struct_methods,			/* struct PyMethodDef *tp_methods; */
+	pyrna_struct_methods,       /* struct PyMethodDef *tp_methods; */
 	NULL,                       /* struct PyMemberDef *tp_members; */
-	pyrna_struct_getseters,		/* struct PyGetSetDef *tp_getset; */
+	pyrna_struct_getseters,     /* struct PyGetSetDef *tp_getset; */
 	NULL,                       /* struct _typeobject *tp_base; */
 	NULL,                       /* PyObject *tp_dict; */
 	NULL,                       /* descrgetfunc tp_descr_get; */
@@ -4781,7 +4781,7 @@ PyTypeObject pyrna_struct_Type= {
 	0,                          /* long tp_dictoffset; */
 	NULL,                       /* initproc tp_init; */
 	NULL,                       /* allocfunc tp_alloc; */
-	pyrna_struct_new,			/* newfunc tp_new; */
+	pyrna_struct_new,           /* newfunc tp_new; */
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
 	/* For PyObject_IS_GC */
@@ -4798,32 +4798,32 @@ PyTypeObject pyrna_struct_Type= {
 /*-----------------------BPy_PropertyRNA method def------------------------------*/
 PyTypeObject pyrna_prop_Type= {
 	PyVarObject_HEAD_INIT(NULL, 0)
-	"bpy_prop",		/* tp_name */
-	sizeof(BPy_PropertyRNA),			/* tp_basicsize */
-	0,			/* tp_itemsize */
+	"bpy_prop",                 /* tp_name */
+	sizeof(BPy_PropertyRNA),    /* tp_basicsize */
+	0,                          /* tp_itemsize */
 	/* methods */
 	(destructor) pyrna_prop_dealloc, /* tp_dealloc */
-	NULL,						/* printfunc tp_print; */
-	NULL,						/* getattrfunc tp_getattr; */
+	NULL,                       /* printfunc tp_print; */
+	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */ /* DEPRECATED in python 3.0! */
-	(reprfunc) pyrna_prop_repr,	/* tp_repr */
+	NULL,                       /* tp_compare */ /* DEPRECATED in python 3.0! */
+	(reprfunc) pyrna_prop_repr, /* tp_repr */
 
 	/* Method suites for standard classes */
 
 	NULL,                       /* PyNumberMethods *tp_as_number; */
-	NULL,						/* PySequenceMethods *tp_as_sequence; */
-	NULL,						/* PyMappingMethods *tp_as_mapping; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
 
 	/* More standard operations (here for binary compatibility) */
 
-	(hashfunc) pyrna_prop_hash,	/* hashfunc tp_hash; */
+	(hashfunc) pyrna_prop_hash, /* hashfunc tp_hash; */
 	NULL,                       /* ternaryfunc tp_call; */
 	(reprfunc) pyrna_prop_str,  /* reprfunc tp_str; */
 
 	/* will only use these if this is a subtype of a py class */
-	NULL,						/* getattrofunc tp_getattro; */
-	NULL,						/* setattrofunc tp_setattro; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
 
 	/* Functions to access object as input/output buffer */
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
@@ -4831,7 +4831,7 @@ PyTypeObject pyrna_prop_Type= {
   /*** Flags to define presence of optional/expanded features ***/
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,         /* long tp_flags; */
 
-	NULL,						/*  char *tp_doc;  Documentation string */
+	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
 	/* call function for all accessible objects */
 	NULL,                       /* traverseproc tp_traverse; */
@@ -4852,11 +4852,11 @@ PyTypeObject pyrna_prop_Type= {
 
   /*** Added in release 2.2 ***/
 	/*   Iterators */
-	NULL,						/* getiterfunc tp_iter; */
+	NULL,                       /* getiterfunc tp_iter; */
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	pyrna_prop_methods,			/* struct PyMethodDef *tp_methods; */
+	pyrna_prop_methods,         /* struct PyMethodDef *tp_methods; */
 	NULL,                       /* struct PyMemberDef *tp_members; */
 	pyrna_prop_getseters,      	/* struct PyGetSetDef *tp_getset; */
 	NULL,                       /* struct _typeobject *tp_base; */
@@ -4866,7 +4866,7 @@ PyTypeObject pyrna_prop_Type= {
 	0,                          /* long tp_dictoffset; */
 	NULL,                       /* initproc tp_init; */
 	NULL,                       /* allocfunc tp_alloc; */
-	pyrna_prop_new,				/* newfunc tp_new; */
+	pyrna_prop_new,             /* newfunc tp_new; */
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
 	/* For PyObject_IS_GC */
@@ -4888,34 +4888,34 @@ PyTypeObject pyrna_prop_array_Type= {
 	/* methods */
 	(destructor)pyrna_prop_array_dealloc, /* tp_dealloc */
 	NULL,                       /* printfunc tp_print; */
-	NULL,						/* getattrfunc tp_getattr; */
+	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */ /* DEPRECATED in python 3.0! */
+	NULL,                       /* tp_compare */ /* DEPRECATED in python 3.0! */
 	NULL,/* subclassed */		/* tp_repr */
 
 	/* Method suites for standard classes */
 
-	&pyrna_prop_array_as_number,    /* PyNumberMethods *tp_as_number; */
-	&pyrna_prop_array_as_sequence,	/* PySequenceMethods *tp_as_sequence; */
-	&pyrna_prop_array_as_mapping,	/* PyMappingMethods *tp_as_mapping; */
+	&pyrna_prop_array_as_number,   /* PyNumberMethods *tp_as_number; */
+	&pyrna_prop_array_as_sequence, /* PySequenceMethods *tp_as_sequence; */
+	&pyrna_prop_array_as_mapping,  /* PyMappingMethods *tp_as_mapping; */
 
 	/* More standard operations (here for binary compatibility) */
 
-	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* hashfunc tp_hash; */
 	NULL,                       /* ternaryfunc tp_call; */
 	NULL,                       /* reprfunc tp_str; */
 
 	/* will only use these if this is a subtype of a py class */
-	(getattrofunc) pyrna_prop_array_getattro,	/* getattrofunc tp_getattro; */
-	NULL,						/* setattrofunc tp_setattro; */
+	(getattrofunc) pyrna_prop_array_getattro, /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
 
 	/* Functions to access object as input/output buffer */
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,         /* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* long tp_flags; */
 
-	NULL,						/*  char *tp_doc;  Documentation string */
+	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
 	/* call function for all accessible objects */
 	NULL,                       /* traverseproc tp_traverse; */
@@ -4925,7 +4925,7 @@ PyTypeObject pyrna_prop_array_Type= {
 
   /***  Assigned meaning in release 2.1 ***/
   /*** rich comparisons ***/
-	NULL, /* subclassed */		/* richcmpfunc tp_richcompare; */
+	NULL, /* subclassed */ /* richcmpfunc tp_richcompare; */
 
   /***  weak reference enabler ***/
 #ifdef USE_WEAKREFS
@@ -4939,22 +4939,22 @@ PyTypeObject pyrna_prop_array_Type= {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	pyrna_prop_array_methods,			/* struct PyMethodDef *tp_methods; */
+	pyrna_prop_array_methods,   /* struct PyMethodDef *tp_methods; */
 	NULL,                       /* struct PyMemberDef *tp_members; */
-	NULL /*pyrna_prop_getseters*/,      	/* struct PyGetSetDef *tp_getset; */
-	&pyrna_prop_Type,                       /* struct _typeobject *tp_base; */
+	NULL /*pyrna_prop_getseters*/, /* struct PyGetSetDef *tp_getset; */
+	&pyrna_prop_Type,           /* struct _typeobject *tp_base; */
 	NULL,                       /* PyObject *tp_dict; */
 	NULL,                       /* descrgetfunc tp_descr_get; */
 	NULL,                       /* descrsetfunc tp_descr_set; */
 	0,                          /* long tp_dictoffset; */
 	NULL,                       /* initproc tp_init; */
 	NULL,                       /* allocfunc tp_alloc; */
-	NULL,						/* newfunc tp_new; */
+	NULL,                       /* newfunc tp_new; */
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
 	/* For PyObject_IS_GC */
 	NULL,                       /* inquiry tp_is_gc;  */
-	NULL,			/* PyObject *tp_bases; */
+	NULL,                       /* PyObject *tp_bases; */
 	/* method resolution order */
 	NULL,                       /* PyObject *tp_mro;  */
 	NULL,                       /* PyObject *tp_cache; */
@@ -4965,32 +4965,32 @@ PyTypeObject pyrna_prop_array_Type= {
 
 PyTypeObject pyrna_prop_collection_Type= {
 	PyVarObject_HEAD_INIT(NULL, 0)
-	"bpy_prop_collection",		/* tp_name */
-	sizeof(BPy_PropertyRNA),			/* tp_basicsize */
-	0,			/* tp_itemsize */
+	"bpy_prop_collection",      /* tp_name */
+	sizeof(BPy_PropertyRNA),    /* tp_basicsize */
+	0,                          /* tp_itemsize */
 	/* methods */
 	(destructor)pyrna_prop_dealloc, /* tp_dealloc */
 	NULL,                       /* printfunc tp_print; */
-	NULL,						/* getattrfunc tp_getattr; */
+	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */ /* DEPRECATED in python 3.0! */
+	NULL,                       /* tp_compare */ /* DEPRECATED in python 3.0! */
 	NULL, /* subclassed */		/* tp_repr */
 
 	/* Method suites for standard classes */
 
 	&pyrna_prop_collection_as_number,   /* PyNumberMethods *tp_as_number; */
-	&pyrna_prop_collection_as_sequence,	/* PySequenceMethods *tp_as_sequence; */
-	&pyrna_prop_collection_as_mapping,	/* PyMappingMethods *tp_as_mapping; */
+	&pyrna_prop_collection_as_sequence, /* PySequenceMethods *tp_as_sequence; */
+	&pyrna_prop_collection_as_mapping,  /* PyMappingMethods *tp_as_mapping; */
 
 	/* More standard operations (here for binary compatibility) */
 
-	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* hashfunc tp_hash; */
 	NULL,                       /* ternaryfunc tp_call; */
 	NULL,                       /* reprfunc tp_str; */
 
 	/* will only use these if this is a subtype of a py class */
-	(getattrofunc) pyrna_prop_collection_getattro,	/* getattrofunc tp_getattro; */
-	(setattrofunc) pyrna_prop_collection_setattro,	/* setattrofunc tp_setattro; */
+	(getattrofunc) pyrna_prop_collection_getattro, /* getattrofunc tp_getattro; */
+	(setattrofunc) pyrna_prop_collection_setattro, /* setattrofunc tp_setattro; */
 
 	/* Functions to access object as input/output buffer */
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
@@ -4998,7 +4998,7 @@ PyTypeObject pyrna_prop_collection_Type= {
   /*** Flags to define presence of optional/expanded features ***/
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,         /* long tp_flags; */
 
-	NULL,						/*  char *tp_doc;  Documentation string */
+	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
 	/* call function for all accessible objects */
 	NULL,                       /* traverseproc tp_traverse; */
@@ -5012,33 +5012,33 @@ PyTypeObject pyrna_prop_collection_Type= {
 
   /***  weak reference enabler ***/
 #ifdef USE_WEAKREFS
-	offsetof(BPy_PropertyRNA, in_weakreflist),	/* long tp_weaklistoffset; */
+	offsetof(BPy_PropertyRNA, in_weakreflist), /* long tp_weaklistoffset; */
 #else
 	0,
 #endif
 
   /*** Added in release 2.2 ***/
 	/*   Iterators */
-	(getiterfunc)pyrna_prop_collection_iter,	/* getiterfunc tp_iter; */
+	(getiterfunc)pyrna_prop_collection_iter, /* getiterfunc tp_iter; */
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	pyrna_prop_collection_methods,			/* struct PyMethodDef *tp_methods; */
+	pyrna_prop_collection_methods, /* struct PyMethodDef *tp_methods; */
 	NULL,                       /* struct PyMemberDef *tp_members; */
-	NULL /*pyrna_prop_getseters*/,      	/* struct PyGetSetDef *tp_getset; */
-	&pyrna_prop_Type,                       /* struct _typeobject *tp_base; */
+	NULL /*pyrna_prop_getseters*/, /* struct PyGetSetDef *tp_getset; */
+	&pyrna_prop_Type,           /* struct _typeobject *tp_base; */
 	NULL,                       /* PyObject *tp_dict; */
 	NULL,                       /* descrgetfunc tp_descr_get; */
 	NULL,                       /* descrsetfunc tp_descr_set; */
 	0,                          /* long tp_dictoffset; */
 	NULL,                       /* initproc tp_init; */
 	NULL,                       /* allocfunc tp_alloc; */
-	NULL,						/* newfunc tp_new; */
+	NULL,                       /* newfunc tp_new; */
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
 	/* For PyObject_IS_GC */
 	NULL,                       /* inquiry tp_is_gc;  */
-	NULL,						/* PyObject *tp_bases; */
+	NULL,                       /* PyObject *tp_bases; */
 	/* method resolution order */
 	NULL,                       /* PyObject *tp_mro;  */
 	NULL,                       /* PyObject *tp_cache; */
@@ -5050,32 +5050,32 @@ PyTypeObject pyrna_prop_collection_Type= {
 /* only for add/remove/move methods */
 static PyTypeObject pyrna_prop_collection_idprop_Type= {
 	PyVarObject_HEAD_INIT(NULL, 0)
-	"bpy_prop_collection_idprop",		/* tp_name */
-	sizeof(BPy_PropertyRNA),			/* tp_basicsize */
-	0,							/* tp_itemsize */
+	"bpy_prop_collection_idprop", /* tp_name */
+	sizeof(BPy_PropertyRNA),    /* tp_basicsize */
+	0,                          /* tp_itemsize */
 	/* methods */
 	(destructor)pyrna_prop_dealloc, /* tp_dealloc */
 	NULL,                       /* printfunc tp_print; */
-	NULL,						/* getattrfunc tp_getattr; */
+	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */ /* DEPRECATED in python 3.0! */
-	NULL, /* subclassed */		/* tp_repr */
+	NULL,                       /* tp_compare */ /* DEPRECATED in python 3.0! */
+	NULL, /* subclassed */      /* tp_repr */
 
 	/* Method suites for standard classes */
 
-	NULL,   /* PyNumberMethods *tp_as_number; */
-	NULL,	/* PySequenceMethods *tp_as_sequence; */
-	NULL,	/* PyMappingMethods *tp_as_mapping; */
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
 
 	/* More standard operations (here for binary compatibility) */
 
-	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* hashfunc tp_hash; */
 	NULL,                       /* ternaryfunc tp_call; */
 	NULL,                       /* reprfunc tp_str; */
 
 	/* will only use these if this is a subtype of a py class */
-	NULL,						/* getattrofunc tp_getattro; */
-	NULL,						/* setattrofunc tp_setattro; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
 
 	/* Functions to access object as input/output buffer */
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
@@ -5083,7 +5083,7 @@ static PyTypeObject pyrna_prop_collection_idprop_Type= {
   /*** Flags to define presence of optional/expanded features ***/
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,         /* long tp_flags; */
 
-	NULL,						/*  char *tp_doc;  Documentation string */
+	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
 	/* call function for all accessible objects */
 	NULL,                       /* traverseproc tp_traverse; */
@@ -5097,33 +5097,33 @@ static PyTypeObject pyrna_prop_collection_idprop_Type= {
 
   /***  weak reference enabler ***/
 #ifdef USE_WEAKREFS
-	offsetof(BPy_PropertyRNA, in_weakreflist),	/* long tp_weaklistoffset; */
+	offsetof(BPy_PropertyRNA, in_weakreflist), /* long tp_weaklistoffset; */
 #else
 	0,
 #endif
 
   /*** Added in release 2.2 ***/
 	/*   Iterators */
-	NULL,						/* getiterfunc tp_iter; */
+	NULL,                       /* getiterfunc tp_iter; */
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
 	pyrna_prop_collection_idprop_methods, /* struct PyMethodDef *tp_methods; */
 	NULL,                       /* struct PyMemberDef *tp_members; */
-	NULL /*pyrna_prop_getseters*/,      	/* struct PyGetSetDef *tp_getset; */
-	&pyrna_prop_collection_Type,            /* struct _typeobject *tp_base; */
+	NULL /*pyrna_prop_getseters*/, /* struct PyGetSetDef *tp_getset; */
+	&pyrna_prop_collection_Type,/* struct _typeobject *tp_base; */
 	NULL,                       /* PyObject *tp_dict; */
 	NULL,                       /* descrgetfunc tp_descr_get; */
 	NULL,                       /* descrsetfunc tp_descr_set; */
 	0,                          /* long tp_dictoffset; */
 	NULL,                       /* initproc tp_init; */
 	NULL,                       /* allocfunc tp_alloc; */
-	NULL,						/* newfunc tp_new; */
+	NULL,                       /* newfunc tp_new; */
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
 	/* For PyObject_IS_GC */
 	NULL,                       /* inquiry tp_is_gc;  */
-	NULL,						/* PyObject *tp_bases; */
+	NULL,                       /* PyObject *tp_bases; */
 	/* method resolution order */
 	NULL,                       /* PyObject *tp_mro;  */
 	NULL,                       /* PyObject *tp_cache; */
@@ -5135,32 +5135,32 @@ static PyTypeObject pyrna_prop_collection_idprop_Type= {
 /*-----------------------BPy_PropertyRNA method def------------------------------*/
 PyTypeObject pyrna_func_Type= {
 	PyVarObject_HEAD_INIT(NULL, 0)
-	"bpy_func",		/* tp_name */
-	sizeof(BPy_FunctionRNA),			/* tp_basicsize */
-	0,			/* tp_itemsize */
+	"bpy_func",                 /* tp_name */
+	sizeof(BPy_FunctionRNA),    /* tp_basicsize */
+	0,                          /* tp_itemsize */
 	/* methods */
-	NULL,						/* tp_dealloc */
-	NULL,						/* printfunc tp_print; */
-	NULL,						/* getattrfunc tp_getattr; */
+	NULL,                       /* tp_dealloc */
+	NULL,                       /* printfunc tp_print; */
+	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */ /* DEPRECATED in python 3.0! */
-	(reprfunc) pyrna_func_repr,	/* tp_repr */
+	NULL,                       /* tp_compare */ /* DEPRECATED in python 3.0! */
+	(reprfunc) pyrna_func_repr, /* tp_repr */
 
 	/* Method suites for standard classes */
 
 	NULL,                       /* PyNumberMethods *tp_as_number; */
-	NULL,						/* PySequenceMethods *tp_as_sequence; */
-	NULL,						/* PyMappingMethods *tp_as_mapping; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
 
 	/* More standard operations (here for binary compatibility) */
 
-	NULL,						/* hashfunc tp_hash; */
-	(ternaryfunc)pyrna_func_call,            /* ternaryfunc tp_call; */
-	NULL,						/* reprfunc tp_str; */
+	NULL,                       /* hashfunc tp_hash; */
+	(ternaryfunc)pyrna_func_call, /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
 
 	/* will only use these if this is a subtype of a py class */
-	NULL,						/* getattrofunc tp_getattro; */
-	NULL,						/* setattrofunc tp_setattro; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
 
 	/* Functions to access object as input/output buffer */
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
@@ -5168,7 +5168,7 @@ PyTypeObject pyrna_func_Type= {
   /*** Flags to define presence of optional/expanded features ***/
 	Py_TPFLAGS_DEFAULT,         /* long tp_flags; */
 
-	NULL,						/*  char *tp_doc;  Documentation string */
+	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
 	/* call function for all accessible objects */
 	NULL,                       /* traverseproc tp_traverse; */
@@ -5178,7 +5178,7 @@ PyTypeObject pyrna_func_Type= {
 
   /***  Assigned meaning in release 2.1 ***/
   /*** rich comparisons ***/
-	NULL,						/* richcmpfunc tp_richcompare; */
+	NULL,                       /* richcmpfunc tp_richcompare; */
 
   /***  weak reference enabler ***/
 #ifdef USE_WEAKREFS
@@ -5189,13 +5189,13 @@ PyTypeObject pyrna_func_Type= {
 
   /*** Added in release 2.2 ***/
 	/*   Iterators */
-	NULL,						/* getiterfunc tp_iter; */
+	NULL,                       /* getiterfunc tp_iter; */
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMethodDef *tp_methods; */
 	NULL,                       /* struct PyMemberDef *tp_members; */
-	NULL,				      	/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct PyGetSetDef *tp_getset; */
 	NULL,                       /* struct _typeobject *tp_base; */
 	NULL,                       /* PyObject *tp_dict; */
 	NULL,                       /* descrgetfunc tp_descr_get; */
@@ -5203,7 +5203,7 @@ PyTypeObject pyrna_func_Type= {
 	0,                          /* long tp_dictoffset; */
 	NULL,                       /* initproc tp_init; */
 	NULL,                       /* allocfunc tp_alloc; */
-	NULL,						/* newfunc tp_new; */
+	NULL,                       /* newfunc tp_new; */
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
 	/* For PyObject_IS_GC */
@@ -5231,32 +5231,32 @@ static PyObject *pyrna_prop_collection_iter_next(BPy_PropertyCollectionIterRNA *
 
 PyTypeObject pyrna_prop_collection_iter_Type= {
 	PyVarObject_HEAD_INIT(NULL, 0)
-	"bpy_prop_collection_iter",		/* tp_name */
-	sizeof(BPy_PropertyCollectionIterRNA),			/* tp_basicsize */
-	0,							/* tp_itemsize */
+	"bpy_prop_collection_iter", /* tp_name */
+	sizeof(BPy_PropertyCollectionIterRNA), /* tp_basicsize */
+	0,                          /* tp_itemsize */
 	/* methods */
 	(destructor)pyrna_prop_collection_iter_dealloc, /* tp_dealloc */
 	NULL,                       /* printfunc tp_print; */
-	NULL,						/* getattrfunc tp_getattr; */
+	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */ /* DEPRECATED in python 3.0! */
+	NULL,                       /* tp_compare */ /* DEPRECATED in python 3.0! */
 	NULL,/* subclassed */		/* tp_repr */
 
 	/* Method suites for standard classes */
 
 	NULL,    /* PyNumberMethods *tp_as_number; */
-	NULL,	/* PySequenceMethods *tp_as_sequence; */
-	NULL,	/* PyMappingMethods *tp_as_mapping; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
 
 	/* More standard operations (here for binary compatibility) */
 
-	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* hashfunc tp_hash; */
 	NULL,                       /* ternaryfunc tp_call; */
 	NULL,                       /* reprfunc tp_str; */
 
 	/* will only use these if this is a subtype of a py class */
-	PyObject_GenericGetAttr,	/* getattrofunc tp_getattro; */
-	NULL,						/* setattrofunc tp_setattro; */
+	PyObject_GenericGetAttr,    /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
 
 	/* Functions to access object as input/output buffer */
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
@@ -5264,7 +5264,7 @@ PyTypeObject pyrna_prop_collection_iter_Type= {
   /*** Flags to define presence of optional/expanded features ***/
 	Py_TPFLAGS_DEFAULT,         /* long tp_flags; */
 
-	NULL,						/*  char *tp_doc;  Documentation string */
+	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
 	/* call function for all accessible objects */
 	NULL,                       /* traverseproc tp_traverse; */
@@ -5278,19 +5278,19 @@ PyTypeObject pyrna_prop_collection_iter_Type= {
 
   /***  weak reference enabler ***/
 #ifdef USE_WEAKREFS
-	offsetof(BPy_PropertyCollectionIterRNA, in_weakreflist),	/* long tp_weaklistoffset; */
+	offsetof(BPy_PropertyCollectionIterRNA, in_weakreflist), /* long tp_weaklistoffset; */
 #else
 	0,
 #endif
   /*** Added in release 2.2 ***/
 	/*   Iterators */
-	PyObject_SelfIter,						/* getiterfunc tp_iter; */
-	(iternextfunc) pyrna_prop_collection_iter_next,                       /* iternextfunc tp_iternext; */
+	PyObject_SelfIter,          /* getiterfunc tp_iter; */
+	(iternextfunc) pyrna_prop_collection_iter_next, /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMethodDef *tp_methods; */
 	NULL,                       /* struct PyMemberDef *tp_members; */
-	NULL,				      	/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct PyGetSetDef *tp_getset; */
 	NULL,                       /* struct _typeobject *tp_base; */
 	NULL,                       /* PyObject *tp_dict; */
 	NULL,                       /* descrgetfunc tp_descr_get; */
@@ -5298,12 +5298,12 @@ PyTypeObject pyrna_prop_collection_iter_Type= {
 	0,                          /* long tp_dictoffset; */
 	NULL,                       /* initproc tp_init; */
 	NULL,                       /* allocfunc tp_alloc; */
-	NULL,						/* newfunc tp_new; */
+	NULL,                       /* newfunc tp_new; */
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
 	/* For PyObject_IS_GC */
 	NULL,                       /* inquiry tp_is_gc;  */
-	NULL,						/* PyObject *tp_bases; */
+	NULL,                       /* PyObject *tp_bases; */
 	/* method resolution order */
 	NULL,                       /* PyObject *tp_mro;  */
 	NULL,                       /* PyObject *tp_cache; */
-- 
cgit v1.2.3


From 8cc307b4f2d2e1321ab8ec1baee6697ae3b0a967 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 3 Sep 2011 06:46:31 +0000
Subject: PyC_ExceptionBuffer is now threadsafe, used for converting exceptions
 into reports.

---
 source/blender/python/generic/py_capi_utils.c | 79 ++++++---------------------
 1 file changed, 18 insertions(+), 61 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index 81aea8571f8..b7e67ec5a93 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -208,77 +208,34 @@ PyObject *PyC_Object_GetAttrStringArgs(PyObject *o, Py_ssize_t n, ...)
 	return item;
 }
 
-/* returns the exception string as a new PyUnicode object, depends on external StringIO module */
+/* returns the exception string as a new PyUnicode object, depends on external traceback module */
 PyObject *PyC_ExceptionBuffer(void)
 {
-	PyObject *stdout_backup = PySys_GetObject("stdout"); /* borrowed */
-	PyObject *stderr_backup = PySys_GetObject("stderr"); /* borrowed */
-	PyObject *string_io = NULL;
-	PyObject *string_io_buf = NULL;
-	PyObject *string_io_mod= NULL;
-	PyObject *string_io_getvalue= NULL;
-	
-	PyObject *error_type, *error_value, *error_traceback;
-	
-	if (!PyErr_Occurred())
-		return NULL;
-	
-	PyErr_Fetch(&error_type, &error_value, &error_traceback);
-	
-	PyErr_Clear();
-	
-	/* import io
-	 * string_io = io.StringIO()
-	 */
-	
-	if(! (string_io_mod= PyImport_ImportModule("io")) ) {
+	PyObject *traceback_mod= NULL;
+	PyObject *format_tb_func= NULL;
+	PyObject *ret= NULL;
+
+	if(! (traceback_mod= PyImport_ImportModule("traceback")) ) {
 		goto error_cleanup;
 	}
-	else if (! (string_io = PyObject_CallMethod(string_io_mod, (char *)"StringIO", NULL))) {
+	else if (! (format_tb_func= PyObject_GetAttrString(traceback_mod, "format_exc"))) {
 		goto error_cleanup;
 	}
-	else if (! (string_io_getvalue= PyObject_GetAttrString(string_io, "getvalue"))) {
-		goto error_cleanup;
+
+	ret= PyObject_CallObject(format_tb_func, NULL);
+
+	if(ret == Py_None) {
+		Py_DECREF(ret);
+		ret= NULL;
 	}
-	
-	Py_INCREF(stdout_backup); // since these were borrowed we dont want them freed when replaced.
-	Py_INCREF(stderr_backup);
-	
-	PySys_SetObject("stdout", string_io); // both of these are free'd when restoring
-	PySys_SetObject("stderr", string_io);
-	
-	PyErr_Restore(error_type, error_value, error_traceback);
-	PyErr_Print(); /* print the error */
-	PyErr_Clear();
-	
-	string_io_buf = PyObject_CallObject(string_io_getvalue, NULL);
-	
-	PySys_SetObject("stdout", stdout_backup);
-	PySys_SetObject("stderr", stderr_backup);
-	
-	Py_DECREF(stdout_backup); /* now sys owns the ref again */
-	Py_DECREF(stderr_backup);
-	
-	Py_DECREF(string_io_mod);
-	Py_DECREF(string_io_getvalue);
-	Py_DECREF(string_io); /* free the original reference */
-	
-	PyErr_Clear();
-	return string_io_buf;
-	
-	
+
 error_cleanup:
 	/* could not import the module so print the error and close */
-	Py_XDECREF(string_io_mod);
-	Py_XDECREF(string_io);
-	
-	PyErr_Restore(error_type, error_value, error_traceback);
-	PyErr_Print(); /* print the error */
-	PyErr_Clear();
-	
-	return NULL;
-}
+	Py_XDECREF(traceback_mod);
+	Py_XDECREF(format_tb_func);
 
+	return ret;
+}
 
 /* string conversion, escape non-unicode chars, coerce must be set to NULL */
 const char *PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce)
-- 
cgit v1.2.3


From a6a14d0a1e2dcc1aa5535a96339245bb645fba58 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nicholasbishop@gmail.com>
Date: Sat, 3 Sep 2011 08:18:43 +0000
Subject: == CustomData ==

* Added comments for each entry in the LAYERTYPEINFO array noting the
  number and name of the layer type; was hard to tell before which
  entry was what
---
 source/blender/blenkernel/intern/customdata.c | 28 +++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 8d19322c0db..c342bbc917f 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -808,41 +808,65 @@ static void layerDefault_mcol(void *data, int count)
 
 
 static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
+	/* 0: CD_MVERT */
 	{sizeof(MVert), "MVert", 1, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* 1: CD_MSTICKY */
 	{sizeof(MSticky), "MSticky", 1, NULL, NULL, NULL, layerInterp_msticky, NULL,
 	 NULL},
+	/* 2: CD_MDEFORMVERT */
 	{sizeof(MDeformVert), "MDeformVert", 1, NULL, layerCopy_mdeformvert,
 	 layerFree_mdeformvert, layerInterp_mdeformvert, NULL, NULL},
+	/* 3: CD_MEDGE */
 	{sizeof(MEdge), "MEdge", 1, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* 4: CD_MFACE */
 	{sizeof(MFace), "MFace", 1, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* 5: CD_MTFACE */
 	{sizeof(MTFace), "MTFace", 1, "UVTex", layerCopy_tface, NULL,
 	 layerInterp_tface, layerSwap_tface, layerDefault_tface},
+	/* 6: CD_MCOL */
 	/* 4 MCol structs per face */
 	{sizeof(MCol)*4, "MCol", 4, "Col", NULL, NULL, layerInterp_mcol,
 	 layerSwap_mcol, layerDefault_mcol},
+	/* 7: CD_ORIGINDEX */
 	{sizeof(int), "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* 8: CD_NORMAL */
 	/* 3 floats per normal vector */
 	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* 9: CD_FLAGS */
 	{sizeof(int), "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* 10: CD_PROP_FLT */
 	{sizeof(MFloatProperty), "MFloatProperty",1,"Float",NULL,NULL,NULL,NULL},
+	/* 11: CD_PROP_INT */
 	{sizeof(MIntProperty), "MIntProperty",1,"Int",NULL,NULL,NULL,NULL},
+	/* 12: CD_PROP_STR */
 	{sizeof(MStringProperty), "MStringProperty",1,"String",NULL,NULL,NULL,NULL},
+	/* 13: CD_ORIGSPACE */
 	{sizeof(OrigSpaceFace), "OrigSpaceFace", 1, "UVTex", layerCopy_origspace_face, NULL,
 	 layerInterp_origspace_face, layerSwap_origspace_face, layerDefault_origspace_face},
+	/* 14: CD_ORCO */
 	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* 15: CD_MTEXPOLY */
 	{sizeof(MTexPoly), "MTexPoly", 1, "Face Texture", NULL, NULL, NULL, NULL, NULL},
+	/* 16: CD_MLOOPUV */
 	{sizeof(MLoopUV), "MLoopUV", 1, "UV coord", NULL, NULL, layerInterp_mloopuv, NULL, NULL},
+	/* 17: CD_MLOOPCOL */
 	{sizeof(MLoopCol), "MLoopCol", 1, "Col", NULL, NULL, layerInterp_mloopcol, NULL, layerDefault_mloopcol},
+	/* 18: CD_TANGENT */
 	{sizeof(float)*4*4, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* 19: CD_MDISPS */
 	{sizeof(MDisps), "MDisps", 1, NULL, layerCopy_mdisps,
 	 layerFree_mdisps, layerInterp_mdisps, layerSwap_mdisps, NULL, layerRead_mdisps, layerWrite_mdisps,
 	 layerFilesize_mdisps, layerValidate_mdisps},
+	/* 20: CD_WEIGHT_MCOL */
 	{sizeof(MCol)*4, "MCol", 4, "WeightCol", NULL, NULL, layerInterp_mcol,
 	 layerSwap_mcol, layerDefault_mcol},
-	 {sizeof(MCol)*4, "MCol", 4, "IDCol", NULL, NULL, layerInterp_mcol,
+	/* 21: CD_ID_MCOL */
+	{sizeof(MCol)*4, "MCol", 4, "IDCol", NULL, NULL, layerInterp_mcol,
 	 layerSwap_mcol, layerDefault_mcol},
-	 {sizeof(MCol)*4, "MCol", 4, "TexturedCol", NULL, NULL, layerInterp_mcol,
+	/* 22: CD_TEXTURE_MCOL */
+	{sizeof(MCol)*4, "MCol", 4, "TexturedCol", NULL, NULL, layerInterp_mcol,
 	 layerSwap_mcol, layerDefault_mcol},
+	/* 23: CD_CLOTH_ORCO */
 	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
-- 
cgit v1.2.3


From a01ffbbddb40c8f14f10aa5edf0cd1ba5dcc6942 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 3 Sep 2011 09:43:20 +0000
Subject: minor edits to build on openbsd

---
 source/blender/blenloader/BLO_sys_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source/blender')

diff --git a/source/blender/blenloader/BLO_sys_types.h b/source/blender/blenloader/BLO_sys_types.h
index d56723ec1c5..2114fc34bf1 100644
--- a/source/blender/blenloader/BLO_sys_types.h
+++ b/source/blender/blenloader/BLO_sys_types.h
@@ -83,7 +83,7 @@ typedef unsigned long uintptr_t;
 #define _UINTPTR_T_DEFINED
 #endif
 
-#elif defined(__linux__) || defined(__NetBSD__)
+#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__)
 
 	/* Linux-i386, Linux-Alpha, Linux-ppc */
 #include <stdint.h>
-- 
cgit v1.2.3


From 451136e7c0860b5240d4fcec50c95cd4790b8e2b Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 3 Sep 2011 15:36:36 +0000
Subject: warning fixes

---
 source/blender/blenkernel/intern/mesh_validate.c |  2 +-
 source/blender/collada/DocumentExporter.cpp      |  7 ++-----
 source/blender/collada/ExtraTags.cpp             | 12 ++++--------
 source/blender/makesrna/intern/rna_scene_api.c   |  2 +-
 4 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c
index 9c916d517c5..70398594872 100644
--- a/source/blender/blenkernel/intern/mesh_validate.c
+++ b/source/blender/blenkernel/intern/mesh_validate.c
@@ -166,7 +166,7 @@ int BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), unsigned int totve
 		}
 
 		if(BLI_edgehash_haskey(edge_hash, med->v1, med->v2)) {
-			PRINT("    edge %u: is a duplicate of, %u\n", i, GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, med->v1, med->v2)));
+			PRINT("    edge %u: is a duplicate of, %d\n", i, GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, med->v1, med->v2)));
 			remove= do_fixes;
 		}
 
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index 285ab283b37..6e780889d16 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -328,9 +328,7 @@ void DocumentExporter::exportCurrentScene(Scene *sce, const char* filename, bool
 	//scale = RNA_struct_find_property(&unit_settings, "scale_length");
 
 	std::string unitname = "meter";
-	float linearmeasure = 1.0f;
-
-	linearmeasure = RNA_float_get(&unit_settings, "scale_length");
+	float linearmeasure = RNA_float_get(&unit_settings, "scale_length");
 
 	switch(RNA_property_enum_get(&unit_settings, system)) {
 		case USER_UNIT_NONE:
@@ -368,8 +366,7 @@ void DocumentExporter::exportCurrentScene(Scene *sce, const char* filename, bool
 
 	asset.setUnit(unitname, linearmeasure);
 	asset.setUpAxisType(COLLADASW::Asset::Z_UP);
-	// TODO: need an Author field in userpref
-	if(strlen(U.author) > 0) {
+	if(U.author[0] != '\0') {
 		asset.getContributor().mAuthor = U.author;
 	}
 	else {
diff --git a/source/blender/collada/ExtraTags.cpp b/source/blender/collada/ExtraTags.cpp
index 653d4a377cd..f0c6d2228b1 100644
--- a/source/blender/collada/ExtraTags.cpp
+++ b/source/blender/collada/ExtraTags.cpp
@@ -90,32 +90,28 @@ std::string ExtraTags::asString( std::string tag, bool *ok)
 void ExtraTags::setData(std::string tag, short *data)
 {
 	bool ok = false;
-	int tmp = 0;
-	tmp = asInt(tag, &ok);
+	int tmp = asInt(tag, &ok);
 	if(ok)
 		*data = (short)tmp;
 }
 void ExtraTags::setData(std::string tag, int *data)
 {
 	bool ok = false;
-	int tmp = 0;
-	tmp = asInt(tag, &ok);
+	int tmp = asInt(tag, &ok);
 	if(ok)
 		*data = tmp;
 }
 void ExtraTags::setData(std::string tag, float *data)
 {
 	bool ok = false;
-	float tmp = 0.0f;
-	tmp = asFloat(tag, &ok);
+	float tmp = asFloat(tag, &ok);
 	if(ok)
 		*data = tmp;
 }
 void ExtraTags::setData(std::string tag, char *data)
 {
 	bool ok = false;
-	int tmp = 0;
-	tmp = asInt(tag, &ok);
+	int tmp = asInt(tag, &ok);
 	if(ok)
 		*data = (char)tmp;
 }
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index 1220c4f34a1..fd7987c18a2 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -111,7 +111,7 @@ void RNA_api_scene(StructRNA *srna)
 #ifdef WITH_COLLADA
 	/* don't remove this, as COLLADA exporting cannot be done through operators in render() callback. */
 	func= RNA_def_function(srna, "collada_export", "rna_Scene_collada_export");
-	parm= RNA_def_string(func, "filepath", "", FILE_MAX, "File Path", "File path to write Collada file.");
+	RNA_def_string(func, "filepath", "", FILE_MAX, "File Path", "File path to write Collada file.");
 	parm= RNA_def_boolean(func, "selected", 0, "Export only selected", "Export only selected elements.");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	RNA_def_property_subtype(parm, PROP_FILEPATH); /* allow non utf8 */
-- 
cgit v1.2.3


From 1764f2135d3c1780c4ead12fae3eb97ac2de5a7d Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Sun, 4 Sep 2011 00:15:59 +0000
Subject: Some whitespace changes

---
 source/blender/collada/AnimationExporter.cpp | 1694 +++++++++++++-------------
 source/blender/collada/AnimationImporter.cpp |  388 +++---
 source/blender/collada/AnimationImporter.h   |   10 +-
 source/blender/collada/ArmatureExporter.cpp  |    2 +-
 source/blender/collada/ArmatureImporter.cpp  |    4 +-
 source/blender/collada/ArmatureImporter.h    |    4 +-
 source/blender/collada/MeshImporter.cpp      |    2 +-
 source/blender/collada/SkinInfo.cpp          |    6 +-
 source/blender/collada/TransformWriter.cpp   |    2 +-
 9 files changed, 1055 insertions(+), 1057 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index 8a0a39da558..4c20d1cf6c1 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -1,26 +1,26 @@
 /*
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor(s): Chingiz Dyussenov, Arystanbek Dyussenov, Jan Diederich, Tod Liverseed.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
+* $Id$
+*
+* ***** BEGIN GPL LICENSE BLOCK *****
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software Foundation,
+* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+* Contributor(s): Chingiz Dyussenov, Arystanbek Dyussenov, Jan Diederich, Tod Liverseed.
+*
+* ***** END GPL LICENSE BLOCK *****
+*/
 
 #include "GeometryExporter.h"
 #include "AnimationExporter.h"
@@ -30,10 +30,10 @@ template<class Functor>
 void forEachObjectInScene(Scene *sce, Functor &f)
 {
 	Base *base= (Base*) sce->base.first;
-	
+
 	while(base) {
 		Object *ob = base->object;
-			
+
 		f(ob);
 
 		base= base->next;
@@ -61,7 +61,7 @@ void AnimationExporter::operator() (Object *ob)
 	bool isMatAnim = false;
 
 	//Export transform animations
-	if(ob->adt && ob->adt->action)      
+	if(ob->adt && ob->adt->action)
 	{
 		fcu = (FCurve*)ob->adt->action->curves.first;
 
@@ -72,21 +72,21 @@ void AnimationExporter::operator() (Object *ob)
 			for (Bone *bone = (Bone*)arm->bonebase.first; bone; bone = bone->next)
 				write_bone_animation_matrix(ob, bone);
 		}
-		
+
 		while (fcu) {
 			//for armature animations as objects
 			if ( ob->type == OB_ARMATURE )
 				transformName =  fcu->rna_path;
 			else 
 				transformName = extract_transform_name( fcu->rna_path );
-		
+
 			if ((!strcmp(transformName, "location") || !strcmp(transformName, "scale")) ||
 				(!strcmp(transformName, "rotation_euler") && ob->rotmode == ROT_MODE_EUL)||
 				(!strcmp(transformName, "rotation_quaternion"))) 
 				dae_animation(ob ,fcu, transformName, false);
 			fcu = fcu->next;
 		}
-	
+
 	}
 
 	//Export Lamp parameter animations
@@ -94,8 +94,8 @@ void AnimationExporter::operator() (Object *ob)
 	{
 		fcu = (FCurve*)(((Lamp*)ob ->data)->adt->action->curves.first);
 		while (fcu) {
-		transformName = extract_transform_name( fcu->rna_path );
-			
+			transformName = extract_transform_name( fcu->rna_path );
+
 			if ((!strcmp(transformName, "color")) || (!strcmp(transformName, "spot_size"))|| (!strcmp(transformName, "spot_blend"))||
 				(!strcmp(transformName, "distance")) ) 
 				dae_animation(ob , fcu, transformName, true );
@@ -108,8 +108,8 @@ void AnimationExporter::operator() (Object *ob)
 	{		
 		fcu = (FCurve*)(((Camera*)ob ->data)->adt->action->curves.first);
 		while (fcu) {
-		transformName = extract_transform_name( fcu->rna_path );
-			
+			transformName = extract_transform_name( fcu->rna_path );
+
 			if ((!strcmp(transformName, "lens"))||
 				(!strcmp(transformName, "ortho_scale"))||
 				(!strcmp(transformName, "clip_end"))||(!strcmp(transformName, "clip_start"))) 
@@ -129,7 +129,7 @@ void AnimationExporter::operator() (Object *ob)
 			fcu = (FCurve*)ma->adt->action->curves.first;
 			while (fcu) {
 				transformName = extract_transform_name( fcu->rna_path );
-				
+
 				if ((!strcmp(transformName, "specular_hardness"))||(!strcmp(transformName, "specular_color"))
 					||(!strcmp(transformName, "diffuse_color"))||(!strcmp(transformName, "alpha"))||
 					(!strcmp(transformName, "ior"))) 
@@ -137,384 +137,384 @@ void AnimationExporter::operator() (Object *ob)
 				fcu = fcu->next;
 			}
 		}
-		
+
 	}
 }
 
-	//euler sources from quternion sources
-	float * AnimationExporter::get_eul_source_for_quat(Object *ob )
+//euler sources from quternion sources
+float * AnimationExporter::get_eul_source_for_quat(Object *ob )
+{
+	FCurve *fcu = (FCurve*)ob->adt->action->curves.first;
+	const int keys = fcu->totvert;  
+	float *quat = (float*)MEM_callocN(sizeof(float) * fcu->totvert * 4, "quat output source values");  
+	float *eul = (float*)MEM_callocN(sizeof(float) * fcu->totvert * 3, "quat output source values");
+	float temp_quat[4];
+	float temp_eul[3];
+	while(fcu)
 	{
-		FCurve *fcu = (FCurve*)ob->adt->action->curves.first;
-		const int keys = fcu->totvert;  
-		float *quat = (float*)MEM_callocN(sizeof(float) * fcu->totvert * 4, "quat output source values");  
-		float *eul = (float*)MEM_callocN(sizeof(float) * fcu->totvert * 3, "quat output source values");
-		float temp_quat[4];
-		float temp_eul[3];
-			while(fcu)
-			{
-				char * transformName = extract_transform_name( fcu->rna_path );
-				
-				if( !strcmp(transformName, "rotation_quaternion") )	{ 
-					for ( int i = 0 ; i < fcu->totvert ; i++){
-						*(quat + ( i * 4 ) + fcu->array_index) = fcu->bezt[i].vec[1][1];
-					}
-				}
-					fcu = fcu->next;
+		char * transformName = extract_transform_name( fcu->rna_path );
+
+		if( !strcmp(transformName, "rotation_quaternion") )	{ 
+			for ( int i = 0 ; i < fcu->totvert ; i++){
+				*(quat + ( i * 4 ) + fcu->array_index) = fcu->bezt[i].vec[1][1];
 			}
+		}
+		fcu = fcu->next;
+	}
 
-			for ( int i = 0 ; i < keys ; i++){
-				for ( int j = 0;j<4;j++)
-					temp_quat[j] = quat[(i*4)+j];
+	for ( int i = 0 ; i < keys ; i++){
+		for ( int j = 0;j<4;j++)
+			temp_quat[j] = quat[(i*4)+j];
 
-				quat_to_eul(temp_eul,temp_quat);
+		quat_to_eul(temp_eul,temp_quat);
 
-				for (int k = 0;k<3;k++)
-					eul[i*3 + k] = temp_eul[k];
-
-			}
-        MEM_freeN(quat);
-		return eul;
+		for (int k = 0;k<3;k++)
+			eul[i*3 + k] = temp_eul[k];
 
 	}
+	MEM_freeN(quat);
+	return eul;
+
+}
+
+//Get proper name for bones
+std::string AnimationExporter::getObjectBoneName( Object* ob,const FCurve* fcu ) 
+{
+	//hard-way to derive the bone name from rna_path. Must find more compact method
+	std::string rna_path = std::string(fcu->rna_path);
 
-	//Get proper name for bones
-	std::string AnimationExporter::getObjectBoneName( Object* ob,const FCurve* fcu ) 
+	char* boneName = strtok((char *)rna_path.c_str(), "\"");
+	boneName = strtok(NULL,"\"");
+
+	if( boneName != NULL )
+		return /*id_name(ob) + "_" +*/ std::string(boneName);
+	else		
+		return id_name(ob);
+}
+
+//convert f-curves to animation curves and write
+void AnimationExporter::dae_animation(Object* ob, FCurve *fcu, char* transformName , bool is_param, Material * ma )
+{
+	const char *axis_name = NULL;
+	char anim_id[200];
+
+	bool has_tangents = false;
+	bool quatRotation = false;
+
+	if ( !strcmp(transformName, "rotation_quaternion") )
 	{
-		//hard-way to derive the bone name from rna_path. Must find more compact method
-		std::string rna_path = std::string(fcu->rna_path);
-
-		char* boneName = strtok((char *)rna_path.c_str(), "\"");
-		boneName = strtok(NULL,"\"");
-		
-		if( boneName != NULL )
-			return /*id_name(ob) + "_" +*/ std::string(boneName);
-		else		
-			return id_name(ob);
+		fprintf(stderr, "quaternion rotation curves are not supported. rotation curve will not be exported\n");
+		quatRotation = true;
+		return;
 	}
 
-	//convert f-curves to animation curves and write
-	void AnimationExporter::dae_animation(Object* ob, FCurve *fcu, char* transformName , bool is_param, Material * ma )
+	//axis names for colors
+	else if ( !strcmp(transformName, "color")||!strcmp(transformName, "specular_color")||!strcmp(transformName, "diffuse_color")||
+		(!strcmp(transformName, "alpha")))
 	{
-		const char *axis_name = NULL;
-		char anim_id[200];
-		
-		bool has_tangents = false;
-		bool quatRotation = false;
-		
-		if ( !strcmp(transformName, "rotation_quaternion") )
-		{
-			fprintf(stderr, "quaternion rotation curves are not supported. rotation curve will not be exported\n");
-			quatRotation = true;
-			return;
-		}
-		
-		//axis names for colors
-		else if ( !strcmp(transformName, "color")||!strcmp(transformName, "specular_color")||!strcmp(transformName, "diffuse_color")||
-				  (!strcmp(transformName, "alpha")))
-		{
-			const char *axis_names[] = {"R", "G", "B"};
-			if (fcu->array_index < 3)
+		const char *axis_names[] = {"R", "G", "B"};
+		if (fcu->array_index < 3)
 			axis_name = axis_names[fcu->array_index];
-		}
+	}
 
-		//axis names for transforms
-		else if ((!strcmp(transformName, "location") || !strcmp(transformName, "scale")) ||
-				(!strcmp(transformName, "rotation_euler"))||(!strcmp(transformName, "rotation_quaternion")))
-		{
-			const char *axis_names[] = {"X", "Y", "Z"};
-			if (fcu->array_index < 3)
+	//axis names for transforms
+	else if ((!strcmp(transformName, "location") || !strcmp(transformName, "scale")) ||
+		(!strcmp(transformName, "rotation_euler"))||(!strcmp(transformName, "rotation_quaternion")))
+	{
+		const char *axis_names[] = {"X", "Y", "Z"};
+		if (fcu->array_index < 3)
 			axis_name = axis_names[fcu->array_index];
-		}
+	}
 
-		//no axis name. single parameter.
-		else{
-			axis_name = "";
-		}
-		
-		std::string ob_name = std::string("null");
-
-		//Create anim Id
-		if (ob->type == OB_ARMATURE) 
-		{   
-			ob_name =  getObjectBoneName( ob , fcu);
-			BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s.%s", (char*)translate_id(ob_name).c_str(),
-				transformName, axis_name);
-		}
-		else 
-		{
-			if (ma)
-				ob_name = id_name(ob) + "_material";
-			else
-				ob_name = id_name(ob);
-			BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char*)translate_id(ob_name).c_str(),
-				 fcu->rna_path, axis_name);
-		}
-		
-		openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
+	//no axis name. single parameter.
+	else{
+		axis_name = "";
+	}
 
-		// create input source
-		std::string input_id = create_source_from_fcurve(COLLADASW::InputSemantic::INPUT, fcu, anim_id, axis_name);
+	std::string ob_name = std::string("null");
 
-		// create output source
-		std::string output_id ;
-		
-		//quat rotations are skipped for now, because of complications with determining axis.
-		if(quatRotation) 
-		{
-			float * eul  = get_eul_source_for_quat(ob);
-			float * eul_axis = (float*)MEM_callocN(sizeof(float) * fcu->totvert, "quat output source values");
-				for ( int i = 0 ; i< fcu->totvert ; i++)
-					eul_axis[i] = eul[i*3 + fcu->array_index];
-			output_id= create_source_from_array(COLLADASW::InputSemantic::OUTPUT, eul_axis , fcu->totvert, quatRotation, anim_id, axis_name);
-			MEM_freeN(eul);
-			MEM_freeN(eul_axis);
-		}
-		else 
-		{
-			output_id= create_source_from_fcurve(COLLADASW::InputSemantic::OUTPUT, fcu, anim_id, axis_name);
-		}
-		// create interpolations source
-		std::string interpolation_id = create_interpolation_source(fcu, anim_id, axis_name, &has_tangents);
-
-		// handle tangents (if required)
-		std::string intangent_id;
-		std::string outtangent_id;
-		
-		if (has_tangents) {
-			// create in_tangent source
-			intangent_id = create_source_from_fcurve(COLLADASW::InputSemantic::IN_TANGENT, fcu, anim_id, axis_name);
-
-			// create out_tangent source
-			outtangent_id = create_source_from_fcurve(COLLADASW::InputSemantic::OUT_TANGENT, fcu, anim_id, axis_name);
-		}
+	//Create anim Id
+	if (ob->type == OB_ARMATURE) 
+	{   
+		ob_name =  getObjectBoneName( ob , fcu);
+		BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s.%s", (char*)translate_id(ob_name).c_str(),
+			transformName, axis_name);
+	}
+	else 
+	{
+		if (ma)
+			ob_name = id_name(ob) + "_material";
+		else
+			ob_name = id_name(ob);
+		BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char*)translate_id(ob_name).c_str(),
+			fcu->rna_path, axis_name);
+	}
 
-		std::string sampler_id = std::string(anim_id) + SAMPLER_ID_SUFFIX;
-		COLLADASW::LibraryAnimations::Sampler sampler(sw, sampler_id);
-		std::string empty;
-		sampler.addInput(COLLADASW::InputSemantic::INPUT, COLLADABU::URI(empty, input_id));
-		sampler.addInput(COLLADASW::InputSemantic::OUTPUT, COLLADABU::URI(empty, output_id));
+	openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
 
-		// this input is required
-		sampler.addInput(COLLADASW::InputSemantic::INTERPOLATION, COLLADABU::URI(empty, interpolation_id));
+	// create input source
+	std::string input_id = create_source_from_fcurve(COLLADASW::InputSemantic::INPUT, fcu, anim_id, axis_name);
 
-		if (has_tangents) {
-			sampler.addInput(COLLADASW::InputSemantic::IN_TANGENT, COLLADABU::URI(empty, intangent_id));
-			sampler.addInput(COLLADASW::InputSemantic::OUT_TANGENT, COLLADABU::URI(empty, outtangent_id));
-		}
+	// create output source
+	std::string output_id ;
 
-		addSampler(sampler);
+	//quat rotations are skipped for now, because of complications with determining axis.
+	if(quatRotation) 
+	{
+		float * eul  = get_eul_source_for_quat(ob);
+		float * eul_axis = (float*)MEM_callocN(sizeof(float) * fcu->totvert, "quat output source values");
+		for ( int i = 0 ; i< fcu->totvert ; i++)
+			eul_axis[i] = eul[i*3 + fcu->array_index];
+		output_id= create_source_from_array(COLLADASW::InputSemantic::OUTPUT, eul_axis , fcu->totvert, quatRotation, anim_id, axis_name);
+		MEM_freeN(eul);
+		MEM_freeN(eul_axis);
+	}
+	else 
+	{
+		output_id= create_source_from_fcurve(COLLADASW::InputSemantic::OUTPUT, fcu, anim_id, axis_name);
+	}
+	// create interpolations source
+	std::string interpolation_id = create_interpolation_source(fcu, anim_id, axis_name, &has_tangents);
 
-		std::string target ;
+	// handle tangents (if required)
+	std::string intangent_id;
+	std::string outtangent_id;
 
-		if ( !is_param )
-			target = translate_id(ob_name)
-			+ "/" + get_transform_sid(fcu->rna_path, -1, axis_name, true);
-		else 
-		{
-			if ( ob->type == OB_LAMP )
-				target = get_light_id(ob)
-				+ "/" + get_light_param_sid(fcu->rna_path, -1, axis_name, true);
+	if (has_tangents) {
+		// create in_tangent source
+		intangent_id = create_source_from_fcurve(COLLADASW::InputSemantic::IN_TANGENT, fcu, anim_id, axis_name);
 
-			if ( ob->type == OB_CAMERA )
-				target = get_camera_id(ob)
-				+ "/" + get_camera_param_sid(fcu->rna_path, -1, axis_name, true);
+		// create out_tangent source
+		outtangent_id = create_source_from_fcurve(COLLADASW::InputSemantic::OUT_TANGENT, fcu, anim_id, axis_name);
+	}
 
-			if( ma ) 
-				target = translate_id(id_name(ma)) + "-effect"
-						+"/common/" /*profile common is only supported */ + get_transform_sid(fcu->rna_path, -1, axis_name, true);
-		}
-		addChannel(COLLADABU::URI(empty, sampler_id), target);
+	std::string sampler_id = std::string(anim_id) + SAMPLER_ID_SUFFIX;
+	COLLADASW::LibraryAnimations::Sampler sampler(sw, sampler_id);
+	std::string empty;
+	sampler.addInput(COLLADASW::InputSemantic::INPUT, COLLADABU::URI(empty, input_id));
+	sampler.addInput(COLLADASW::InputSemantic::OUTPUT, COLLADABU::URI(empty, output_id));
+
+	// this input is required
+	sampler.addInput(COLLADASW::InputSemantic::INTERPOLATION, COLLADABU::URI(empty, interpolation_id));
 
-		closeAnimation();
+	if (has_tangents) {
+		sampler.addInput(COLLADASW::InputSemantic::IN_TANGENT, COLLADABU::URI(empty, intangent_id));
+		sampler.addInput(COLLADASW::InputSemantic::OUT_TANGENT, COLLADABU::URI(empty, outtangent_id));
 	}
 
+	addSampler(sampler);
+
+	std::string target ;
 
-	
-	//write bone animations in transform matrix sources
-	void AnimationExporter::write_bone_animation_matrix(Object *ob_arm, Bone *bone)
+	if ( !is_param )
+		target = translate_id(ob_name)
+		+ "/" + get_transform_sid(fcu->rna_path, -1, axis_name, true);
+	else 
 	{
-		if (!ob_arm->adt)
-			return;
-		
-		//This will only export animations of bones in deform group.
-		/*if(!is_bone_deform_group(bone))
-			return;*/
-		
-		sample_and_write_bone_animation_matrix(ob_arm, bone);
-
-		for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next)
-			write_bone_animation_matrix(ob_arm, child);
+		if ( ob->type == OB_LAMP )
+			target = get_light_id(ob)
+			+ "/" + get_light_param_sid(fcu->rna_path, -1, axis_name, true);
+
+		if ( ob->type == OB_CAMERA )
+			target = get_camera_id(ob)
+			+ "/" + get_camera_param_sid(fcu->rna_path, -1, axis_name, true);
+
+		if( ma ) 
+			target = translate_id(id_name(ma)) + "-effect"
+			+"/common/" /*profile common is only supported */ + get_transform_sid(fcu->rna_path, -1, axis_name, true);
 	}
+	addChannel(COLLADABU::URI(empty, sampler_id), target);
 
-	bool AnimationExporter::is_bone_deform_group(Bone * bone)
+	closeAnimation();
+}
+
+
+
+//write bone animations in transform matrix sources
+void AnimationExporter::write_bone_animation_matrix(Object *ob_arm, Bone *bone)
+{
+	if (!ob_arm->adt)
+		return;
+
+	//This will only export animations of bones in deform group.
+	/*if(!is_bone_deform_group(bone))
+	return;*/
+
+	sample_and_write_bone_animation_matrix(ob_arm, bone);
+
+	for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next)
+		write_bone_animation_matrix(ob_arm, child);
+}
+
+bool AnimationExporter::is_bone_deform_group(Bone * bone)
+{   
+	bool is_def;
+	//Check if current bone is deform
+	if((bone->flag & BONE_NO_DEFORM) == 0 ) return true;
+	//Check child bones
+	else 
 	{   
-		bool is_def;
-		//Check if current bone is deform
-		if((bone->flag & BONE_NO_DEFORM) == 0 ) return true;
-		//Check child bones
-		else 
-		{   
-			for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next){
-				//loop through all the children until deform bone is found, and then return
-				is_def = is_bone_deform_group(child);
-				if (is_def) return true;
-			}
+		for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next){
+			//loop through all the children until deform bone is found, and then return
+			is_def = is_bone_deform_group(child);
+			if (is_def) return true;
 		}
-        //no deform bone found in children also
-		return false;
 	}
+	//no deform bone found in children also
+	return false;
+}
 
-	void AnimationExporter::sample_and_write_bone_animation_matrix(Object *ob_arm, Bone *bone)
-	{
-		bArmature *arm = (bArmature*)ob_arm->data;
-		int flag = arm->flag;
-		std::vector<float> fra;
-		//char prefix[256];
-
-		FCurve* fcu = (FCurve*)ob_arm->adt->action->curves.first;
-		while(fcu)
-		{
-			std::string bone_name = getObjectBoneName(ob_arm,fcu);
-			int val = BLI_strcasecmp((char*)bone_name.c_str(),bone->name);
-			if(val==0) break;
-			fcu = fcu->next;
-		}
+void AnimationExporter::sample_and_write_bone_animation_matrix(Object *ob_arm, Bone *bone)
+{
+	bArmature *arm = (bArmature*)ob_arm->data;
+	int flag = arm->flag;
+	std::vector<float> fra;
+	//char prefix[256];
 
-		if(!(fcu)) return; 
-		bPoseChannel *pchan = get_pose_channel(ob_arm->pose, bone->name);
-		if (!pchan)
-			return;
-	
-		find_frames(ob_arm, fra);
+	FCurve* fcu = (FCurve*)ob_arm->adt->action->curves.first;
+	while(fcu)
+	{
+		std::string bone_name = getObjectBoneName(ob_arm,fcu);
+		int val = BLI_strcasecmp((char*)bone_name.c_str(),bone->name);
+		if(val==0) break;
+		fcu = fcu->next;
+	}
 
-		if (flag & ARM_RESTPOS) {
-			arm->flag &= ~ARM_RESTPOS;
-			where_is_pose(scene, ob_arm);
-		}
+	if(!(fcu)) return; 
+	bPoseChannel *pchan = get_pose_channel(ob_arm->pose, bone->name);
+	if (!pchan)
+		return;
 
-		if (fra.size()) {
-			dae_baked_animation(fra ,ob_arm, bone );
-		}
+	find_frames(ob_arm, fra);
 
-		if (flag & ARM_RESTPOS) 
-			arm->flag = flag;
+	if (flag & ARM_RESTPOS) {
+		arm->flag &= ~ARM_RESTPOS;
 		where_is_pose(scene, ob_arm);
 	}
 
-	void AnimationExporter::dae_baked_animation(std::vector<float> &fra, Object *ob_arm , Bone *bone)
-	{
-		std::string ob_name = id_name(ob_arm);
-		std::string bone_name = bone->name;
-		char anim_id[200];
-		
-		if (!fra.size())
-			return;
+	if (fra.size()) {
+		dae_baked_animation(fra ,ob_arm, bone );
+	}
 
-		BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char*)translate_id(ob_name).c_str(),
-					 (char*)translate_id(bone_name).c_str(), "pose_matrix");
+	if (flag & ARM_RESTPOS) 
+		arm->flag = flag;
+	where_is_pose(scene, ob_arm);
+}
 
-		openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
+void AnimationExporter::dae_baked_animation(std::vector<float> &fra, Object *ob_arm , Bone *bone)
+{
+	std::string ob_name = id_name(ob_arm);
+	std::string bone_name = bone->name;
+	char anim_id[200];
 
-		// create input source
-		std::string input_id = create_source_from_vector(COLLADASW::InputSemantic::INPUT, fra, false, anim_id, "");
+	if (!fra.size())
+		return;
 
-		// create output source
-		std::string output_id;
-		output_id = create_4x4_source( fra, ob_arm , bone ,  anim_id);
+	BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char*)translate_id(ob_name).c_str(),
+		(char*)translate_id(bone_name).c_str(), "pose_matrix");
 
-		// create interpolations source
-		std::string interpolation_id = fake_interpolation_source(fra.size(), anim_id, "");
+	openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
 
-		std::string sampler_id = std::string(anim_id) + SAMPLER_ID_SUFFIX;
-		COLLADASW::LibraryAnimations::Sampler sampler(sw, sampler_id);
-		std::string empty;
-		sampler.addInput(COLLADASW::InputSemantic::INPUT, COLLADABU::URI(empty, input_id));
-		sampler.addInput(COLLADASW::InputSemantic::OUTPUT, COLLADABU::URI(empty, output_id));
+	// create input source
+	std::string input_id = create_source_from_vector(COLLADASW::InputSemantic::INPUT, fra, false, anim_id, "");
 
-		// TODO create in/out tangents source
+	// create output source
+	std::string output_id;
+	output_id = create_4x4_source( fra, ob_arm , bone ,  anim_id);
 
-		// this input is required
-		sampler.addInput(COLLADASW::InputSemantic::INTERPOLATION, COLLADABU::URI(empty, interpolation_id));
+	// create interpolations source
+	std::string interpolation_id = fake_interpolation_source(fra.size(), anim_id, "");
 
-		addSampler(sampler);
+	std::string sampler_id = std::string(anim_id) + SAMPLER_ID_SUFFIX;
+	COLLADASW::LibraryAnimations::Sampler sampler(sw, sampler_id);
+	std::string empty;
+	sampler.addInput(COLLADASW::InputSemantic::INPUT, COLLADABU::URI(empty, input_id));
+	sampler.addInput(COLLADASW::InputSemantic::OUTPUT, COLLADABU::URI(empty, output_id));
 
-		std::string target = translate_id(bone_name) + "/transform";
-		addChannel(COLLADABU::URI(empty, sampler_id), target);
+	// TODO create in/out tangents source
 
-		closeAnimation();
-	}
+	// this input is required
+	sampler.addInput(COLLADASW::InputSemantic::INTERPOLATION, COLLADABU::URI(empty, interpolation_id));
 
-	// dae_bone_animation -> add_bone_animation
-	// (blend this into dae_bone_animation)
-	void AnimationExporter::dae_bone_animation(std::vector<float> &fra, float *values, int tm_type, int axis, std::string ob_name, std::string bone_name)
-	{
-		const char *axis_names[] = {"X", "Y", "Z"};
-		const char *axis_name = NULL;
-		char anim_id[200];
-		bool is_rot = tm_type == 0;
-		
-		if (!fra.size())
-			return;
+	addSampler(sampler);
 
-		char rna_path[200];
-		BLI_snprintf(rna_path, sizeof(rna_path), "pose.bones[\"%s\"].%s", bone_name.c_str(),
-					 tm_type == 0 ? "rotation_quaternion" : (tm_type == 1 ? "scale" : "location"));
+	std::string target = translate_id(bone_name) + "/transform";
+	addChannel(COLLADABU::URI(empty, sampler_id), target);
 
-		if (axis > -1)
-			axis_name = axis_names[axis];
-		
-		std::string transform_sid = get_transform_sid(NULL, tm_type, axis_name, false);
-		
-		BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char*)translate_id(ob_name).c_str(),
-					 (char*)translate_id(bone_name).c_str(), (char*)transform_sid.c_str());
+	closeAnimation();
+}
 
-		openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
+// dae_bone_animation -> add_bone_animation
+// (blend this into dae_bone_animation)
+void AnimationExporter::dae_bone_animation(std::vector<float> &fra, float *values, int tm_type, int axis, std::string ob_name, std::string bone_name)
+{
+	const char *axis_names[] = {"X", "Y", "Z"};
+	const char *axis_name = NULL;
+	char anim_id[200];
+	bool is_rot = tm_type == 0;
 
-		// create input source
-		std::string input_id = create_source_from_vector(COLLADASW::InputSemantic::INPUT, fra, is_rot, anim_id, axis_name);
+	if (!fra.size())
+		return;
 
-		// create output source
-		std::string output_id;
-		if (axis == -1)
-			output_id = create_xyz_source(values, fra.size(), anim_id);
-		else
-			output_id = create_source_from_array(COLLADASW::InputSemantic::OUTPUT, values, fra.size(), is_rot, anim_id, axis_name);
+	char rna_path[200];
+	BLI_snprintf(rna_path, sizeof(rna_path), "pose.bones[\"%s\"].%s", bone_name.c_str(),
+		tm_type == 0 ? "rotation_quaternion" : (tm_type == 1 ? "scale" : "location"));
 
-		// create interpolations source
-		std::string interpolation_id = fake_interpolation_source(fra.size(), anim_id, axis_name);
+	if (axis > -1)
+		axis_name = axis_names[axis];
 
-		std::string sampler_id = std::string(anim_id) + SAMPLER_ID_SUFFIX;
-		COLLADASW::LibraryAnimations::Sampler sampler(sw, sampler_id);
-		std::string empty;
-		sampler.addInput(COLLADASW::InputSemantic::INPUT, COLLADABU::URI(empty, input_id));
-		sampler.addInput(COLLADASW::InputSemantic::OUTPUT, COLLADABU::URI(empty, output_id));
+	std::string transform_sid = get_transform_sid(NULL, tm_type, axis_name, false);
 
-		// TODO create in/out tangents source
+	BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char*)translate_id(ob_name).c_str(),
+		(char*)translate_id(bone_name).c_str(), (char*)transform_sid.c_str());
 
-		// this input is required
-		sampler.addInput(COLLADASW::InputSemantic::INTERPOLATION, COLLADABU::URI(empty, interpolation_id));
+	openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
 
-		addSampler(sampler);
+	// create input source
+	std::string input_id = create_source_from_vector(COLLADASW::InputSemantic::INPUT, fra, is_rot, anim_id, axis_name);
 
-		std::string target = translate_id(ob_name + "_" + bone_name) + "/" + transform_sid;
-		addChannel(COLLADABU::URI(empty, sampler_id), target);
+	// create output source
+	std::string output_id;
+	if (axis == -1)
+		output_id = create_xyz_source(values, fra.size(), anim_id);
+	else
+		output_id = create_source_from_array(COLLADASW::InputSemantic::OUTPUT, values, fra.size(), is_rot, anim_id, axis_name);
 
-		closeAnimation();
-	}
+	// create interpolations source
+	std::string interpolation_id = fake_interpolation_source(fra.size(), anim_id, axis_name);
 
-	float AnimationExporter::convert_time(float frame)
-	{
-		return FRA2TIME(frame);
-	}
+	std::string sampler_id = std::string(anim_id) + SAMPLER_ID_SUFFIX;
+	COLLADASW::LibraryAnimations::Sampler sampler(sw, sampler_id);
+	std::string empty;
+	sampler.addInput(COLLADASW::InputSemantic::INPUT, COLLADABU::URI(empty, input_id));
+	sampler.addInput(COLLADASW::InputSemantic::OUTPUT, COLLADABU::URI(empty, output_id));
 
-	float AnimationExporter::convert_angle(float angle)
-	{
-		return COLLADABU::Math::Utils::radToDegF(angle);
-	}
+	// TODO create in/out tangents source
 
-	std::string AnimationExporter::get_semantic_suffix(COLLADASW::InputSemantic::Semantics semantic)
-	{
-		switch(semantic) {
+	// this input is required
+	sampler.addInput(COLLADASW::InputSemantic::INTERPOLATION, COLLADABU::URI(empty, interpolation_id));
+
+	addSampler(sampler);
+
+	std::string target = translate_id(ob_name + "_" + bone_name) + "/" + transform_sid;
+	addChannel(COLLADABU::URI(empty, sampler_id), target);
+
+	closeAnimation();
+}
+
+float AnimationExporter::convert_time(float frame)
+{
+	return FRA2TIME(frame);
+}
+
+float AnimationExporter::convert_angle(float angle)
+{
+	return COLLADABU::Math::Utils::radToDegF(angle);
+}
+
+std::string AnimationExporter::get_semantic_suffix(COLLADASW::InputSemantic::Semantics semantic)
+{
+	switch(semantic) {
 		case COLLADASW::InputSemantic::INPUT:
 			return INPUT_SOURCE_ID_SUFFIX;
 		case COLLADASW::InputSemantic::OUTPUT:
@@ -527,14 +527,14 @@ void AnimationExporter::operator() (Object *ob)
 			return OUTTANGENT_SOURCE_ID_SUFFIX;
 		default:
 			break;
-		}
-		return "";
 	}
+	return "";
+}
 
-	void AnimationExporter::add_source_parameters(COLLADASW::SourceBase::ParameterNameList& param,
-							   COLLADASW::InputSemantic::Semantics semantic, bool is_rot, const char *axis, bool transform)
-	{
-		switch(semantic) {
+void AnimationExporter::add_source_parameters(COLLADASW::SourceBase::ParameterNameList& param,
+											  COLLADASW::InputSemantic::Semantics semantic, bool is_rot, const char *axis, bool transform)
+{
+	switch(semantic) {
 		case COLLADASW::InputSemantic::INPUT:
 			param.push_back("TIME");
 			break;
@@ -547,14 +547,14 @@ void AnimationExporter::operator() (Object *ob)
 					param.push_back(axis);
 				}
 				else 
-				if ( transform )
-				{
-					param.push_back("TRANSFORM");  
-				}else{                           //assumes if axis isn't specified all axises are added
-					param.push_back("X");
-					param.push_back("Y");
-					param.push_back("Z");
-				}
+					if ( transform )
+					{
+						param.push_back("TRANSFORM");  
+					}else{ //assumes if axis isn't specified all axises are added
+						param.push_back("X");
+						param.push_back("Y");
+						param.push_back("Z");
+					}
 			}
 			break;
 		case COLLADASW::InputSemantic::IN_TANGENT:
@@ -564,12 +564,12 @@ void AnimationExporter::operator() (Object *ob)
 			break;
 		default:
 			break;
-		}
 	}
+}
 
-	void AnimationExporter::get_source_values(BezTriple *bezt, COLLADASW::InputSemantic::Semantics semantic, bool rotation, float *values, int *length)
-	{
-		switch (semantic) {
+void AnimationExporter::get_source_values(BezTriple *bezt, COLLADASW::InputSemantic::Semantics semantic, bool rotation, float *values, int *length)
+{
+	switch (semantic) {
 		case COLLADASW::InputSemantic::INPUT:
 			*length = 1;
 			values[0] = convert_time(bezt->vec[1][0]);
@@ -583,9 +583,9 @@ void AnimationExporter::operator() (Object *ob)
 				values[0] = bezt->vec[1][1];
 			}
 			break;
-		
+
 		case COLLADASW::InputSemantic::IN_TANGENT:
-		*length = 2;
+			*length = 2;
 			values[0] = convert_time(bezt->vec[0][0]);
 			if (bezt->ipo != BEZT_IPO_BEZ) {
 				// We're in a mixed interpolation scenario, set zero as it's irrelevant but value might contain unused data
@@ -598,7 +598,7 @@ void AnimationExporter::operator() (Object *ob)
 				values[1] = bezt->vec[0][1];
 			}
 			break;
-		
+
 		case COLLADASW::InputSemantic::OUT_TANGENT:
 			*length = 2;
 			values[0] = convert_time(bezt->vec[2][0]);
@@ -617,283 +617,283 @@ void AnimationExporter::operator() (Object *ob)
 		default:
 			*length = 0;
 			break;
-		}
 	}
+}
 
-	std::string AnimationExporter::create_source_from_fcurve(COLLADASW::InputSemantic::Semantics semantic, FCurve *fcu, const std::string& anim_id, const char *axis_name)
-	{
-		std::string source_id = anim_id + get_semantic_suffix(semantic);
-
-		//bool is_rotation = !strcmp(fcu->rna_path, "rotation");
-		bool is_angle = false;
-		
-		if (strstr(fcu->rna_path, "rotation")) is_angle = true;
-		
-		COLLADASW::FloatSourceF source(mSW);
-		source.setId(source_id);
-		source.setArrayId(source_id + ARRAY_ID_SUFFIX);
-		source.setAccessorCount(fcu->totvert);
-		
-		switch (semantic) {
+std::string AnimationExporter::create_source_from_fcurve(COLLADASW::InputSemantic::Semantics semantic, FCurve *fcu, const std::string& anim_id, const char *axis_name)
+{
+	std::string source_id = anim_id + get_semantic_suffix(semantic);
+
+	//bool is_rotation = !strcmp(fcu->rna_path, "rotation");
+	bool is_angle = false;
+
+	if (strstr(fcu->rna_path, "rotation")) is_angle = true;
+
+	COLLADASW::FloatSourceF source(mSW);
+	source.setId(source_id);
+	source.setArrayId(source_id + ARRAY_ID_SUFFIX);
+	source.setAccessorCount(fcu->totvert);
+
+	switch (semantic) {
 		case COLLADASW::InputSemantic::INPUT:
 		case COLLADASW::InputSemantic::OUTPUT:
-		source.setAccessorStride(1);			
+			source.setAccessorStride(1);			
 			break;
 		case COLLADASW::InputSemantic::IN_TANGENT:
 		case COLLADASW::InputSemantic::OUT_TANGENT:
-		source.setAccessorStride(2);			
+			source.setAccessorStride(2);			
 			break;
-		}
-		
-		
-		COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
-		add_source_parameters(param, semantic, is_angle, axis_name, false);
+	}
 
-		source.prepareToAppendValues();
 
-		for (unsigned int i = 0; i < fcu->totvert; i++) {
-			float values[3]; // be careful!
-			int length = 0;
-			get_source_values(&fcu->bezt[i], semantic, is_angle, values, &length);
-				for (int j = 0; j < length; j++)
-				source.appendValues(values[j]);
-		}
+	COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
+	add_source_parameters(param, semantic, is_angle, axis_name, false);
 
-		source.finish();
+	source.prepareToAppendValues();
 
-		return source_id;
+	for (unsigned int i = 0; i < fcu->totvert; i++) {
+		float values[3]; // be careful!
+		int length = 0;
+		get_source_values(&fcu->bezt[i], semantic, is_angle, values, &length);
+		for (int j = 0; j < length; j++)
+			source.appendValues(values[j]);
 	}
 
-	//Currently called only to get OUTPUT source values ( if rotation and hence the axis is also specified )
-	std::string AnimationExporter::create_source_from_array(COLLADASW::InputSemantic::Semantics semantic, float *v, int tot, bool is_rot, const std::string& anim_id, const char *axis_name)
-	{
-		std::string source_id = anim_id + get_semantic_suffix(semantic);
-
-		COLLADASW::FloatSourceF source(mSW);
-		source.setId(source_id);
-		source.setArrayId(source_id + ARRAY_ID_SUFFIX);
-		source.setAccessorCount(tot);
-		source.setAccessorStride(1);
-		
-		COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
-		add_source_parameters(param, semantic, is_rot, axis_name,  false);
-
-		source.prepareToAppendValues();
-
-		for (int i = 0; i < tot; i++) {
-			float val = v[i];
-			////if (semantic == COLLADASW::InputSemantic::INPUT)
-			//	val = convert_time(val);
-			//else
-				if (is_rot)                       
-				val *= 180.0f / M_PI;
-			source.appendValues(val);
-		}
+	source.finish();
 
-		source.finish();
+	return source_id;
+}
 
-		return source_id;
+//Currently called only to get OUTPUT source values ( if rotation and hence the axis is also specified )
+std::string AnimationExporter::create_source_from_array(COLLADASW::InputSemantic::Semantics semantic, float *v, int tot, bool is_rot, const std::string& anim_id, const char *axis_name)
+{
+	std::string source_id = anim_id + get_semantic_suffix(semantic);
+
+	COLLADASW::FloatSourceF source(mSW);
+	source.setId(source_id);
+	source.setArrayId(source_id + ARRAY_ID_SUFFIX);
+	source.setAccessorCount(tot);
+	source.setAccessorStride(1);
+
+	COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
+	add_source_parameters(param, semantic, is_rot, axis_name,  false);
+
+	source.prepareToAppendValues();
+
+	for (int i = 0; i < tot; i++) {
+		float val = v[i];
+		////if (semantic == COLLADASW::InputSemantic::INPUT)
+		//	val = convert_time(val);
+		//else
+		if (is_rot)
+			val *= 180.0f / M_PI;
+		source.appendValues(val);
 	}
-// only used for sources with INPUT semantic
-	std::string AnimationExporter::create_source_from_vector(COLLADASW::InputSemantic::Semantics semantic, std::vector<float> &fra, bool is_rot, const std::string& anim_id, const char *axis_name)
-	{
-		std::string source_id = anim_id + get_semantic_suffix(semantic);
-
-		COLLADASW::FloatSourceF source(mSW);
-		source.setId(source_id);
-		source.setArrayId(source_id + ARRAY_ID_SUFFIX);
-		source.setAccessorCount(fra.size());
-		source.setAccessorStride(1);
-		
-		COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
-		add_source_parameters(param, semantic, is_rot, axis_name, false);
-
-		source.prepareToAppendValues();
-
-		std::vector<float>::iterator it;
-		for (it = fra.begin(); it != fra.end(); it++) {
-			float val = *it;
-			//if (semantic == COLLADASW::InputSemantic::INPUT)
-				val = convert_time(val);
-			/*else if (is_rot)
-				val = convert_angle(val);*/
-			source.appendValues(val);
-		}
 
-		source.finish();
+	source.finish();
 
-		return source_id;
+	return source_id;
+}
+// only used for sources with INPUT semantic
+std::string AnimationExporter::create_source_from_vector(COLLADASW::InputSemantic::Semantics semantic, std::vector<float> &fra, bool is_rot, const std::string& anim_id, const char *axis_name)
+{
+	std::string source_id = anim_id + get_semantic_suffix(semantic);
+
+	COLLADASW::FloatSourceF source(mSW);
+	source.setId(source_id);
+	source.setArrayId(source_id + ARRAY_ID_SUFFIX);
+	source.setAccessorCount(fra.size());
+	source.setAccessorStride(1);
+
+	COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
+	add_source_parameters(param, semantic, is_rot, axis_name, false);
+
+	source.prepareToAppendValues();
+
+	std::vector<float>::iterator it;
+	for (it = fra.begin(); it != fra.end(); it++) {
+		float val = *it;
+		//if (semantic == COLLADASW::InputSemantic::INPUT)
+		val = convert_time(val);
+		/*else if (is_rot)
+		val = convert_angle(val);*/
+		source.appendValues(val);
 	}
 
-	std::string AnimationExporter::create_4x4_source(std::vector<float> &frames , Object * ob_arm, Bone *bone , const std::string& anim_id)
-	{
-		COLLADASW::InputSemantic::Semantics semantic = COLLADASW::InputSemantic::OUTPUT;
-		std::string source_id = anim_id + get_semantic_suffix(semantic);
+	source.finish();
 
-		COLLADASW::Float4x4Source source(mSW);
-		source.setId(source_id);
-		source.setArrayId(source_id + ARRAY_ID_SUFFIX);
-		source.setAccessorCount(frames.size());
-		source.setAccessorStride(16);
-		
-		COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
-		add_source_parameters(param, semantic, false, NULL, true);
+	return source_id;
+}
 
-		source.prepareToAppendValues();
-		
-		bPoseChannel *parchan = NULL;
-		bPoseChannel *pchan = NULL;
-		bPose *pose = ob_arm->pose;
+std::string AnimationExporter::create_4x4_source(std::vector<float> &frames , Object * ob_arm, Bone *bone , const std::string& anim_id)
+{
+	COLLADASW::InputSemantic::Semantics semantic = COLLADASW::InputSemantic::OUTPUT;
+	std::string source_id = anim_id + get_semantic_suffix(semantic);
 
-		pchan = get_pose_channel(pose, bone->name);
+	COLLADASW::Float4x4Source source(mSW);
+	source.setId(source_id);
+	source.setArrayId(source_id + ARRAY_ID_SUFFIX);
+	source.setAccessorCount(frames.size());
+	source.setAccessorStride(16);
 
-		if (!pchan)
-			return "";
+	COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
+	add_source_parameters(param, semantic, false, NULL, true);
 
-		parchan = pchan->parent;
+	source.prepareToAppendValues();
 
-		enable_fcurves(ob_arm->adt->action, bone->name);
+	bPoseChannel *parchan = NULL;
+	bPoseChannel *pchan = NULL;
+	bPose *pose = ob_arm->pose;
 
-		std::vector<float>::iterator it;
-		int j = 0;
-		for (it = frames.begin(); it != frames.end(); it++) {
-			float mat[4][4], ipar[4][4];
+	pchan = get_pose_channel(pose, bone->name);
 
-			float ctime = bsystem_time(scene, ob_arm, *it, 0.0f);
+	if (!pchan)
+		return "";
 
-			BKE_animsys_evaluate_animdata(scene , &ob_arm->id, ob_arm->adt, ctime, ADT_RECALC_ANIM);
-			where_is_pose_bone(scene, ob_arm, pchan, ctime, 1);
+	parchan = pchan->parent;
 
-			// compute bone local mat
-			if (bone->parent) {
-				invert_m4_m4(ipar, parchan->pose_mat);
-				mul_m4_m4m4(mat, pchan->pose_mat, ipar);
-			}
-			else
-				copy_m4_m4(mat, pchan->pose_mat);
-			UnitConverter converter;
+	enable_fcurves(ob_arm->adt->action, bone->name);
 
-			float outmat[4][4];
-			converter.mat4_to_dae(outmat,mat);
+	std::vector<float>::iterator it;
+	int j = 0;
+	for (it = frames.begin(); it != frames.end(); it++) {
+		float mat[4][4], ipar[4][4];
 
+		float ctime = bsystem_time(scene, ob_arm, *it, 0.0f);
 
-			source.appendValues(outmat);
-			
+		BKE_animsys_evaluate_animdata(scene , &ob_arm->id, ob_arm->adt, ctime, ADT_RECALC_ANIM);
+		where_is_pose_bone(scene, ob_arm, pchan, ctime, 1);
 
-			j++;
+		// compute bone local mat
+		if (bone->parent) {
+			invert_m4_m4(ipar, parchan->pose_mat);
+			mul_m4_m4m4(mat, pchan->pose_mat, ipar);
 		}
+		else
+			copy_m4_m4(mat, pchan->pose_mat);
+		UnitConverter converter;
 
-		enable_fcurves(ob_arm->adt->action, NULL);
+		float outmat[4][4];
+		converter.mat4_to_dae(outmat,mat);
 
-		source.finish();
 
-		return source_id;
-	}
-	// only used for sources with OUTPUT semantic ( locations and scale)
-	std::string AnimationExporter::create_xyz_source(float *v, int tot, const std::string& anim_id)
-	{
-		COLLADASW::InputSemantic::Semantics semantic = COLLADASW::InputSemantic::OUTPUT;
-		std::string source_id = anim_id + get_semantic_suffix(semantic);
-
-		COLLADASW::FloatSourceF source(mSW);
-		source.setId(source_id);
-		source.setArrayId(source_id + ARRAY_ID_SUFFIX);
-		source.setAccessorCount(tot);
-		source.setAccessorStride(3);
-		
-		COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
-		add_source_parameters(param, semantic, false, NULL, false);
-
-		source.prepareToAppendValues();
-
-		for (int i = 0; i < tot; i++) {
-			source.appendValues(*v, *(v + 1), *(v + 2));
-			v += 3;
-		}
+		source.appendValues(outmat);
 
-		source.finish();
 
-		return source_id;
+		j++;
 	}
 
-	std::string AnimationExporter::create_interpolation_source(FCurve *fcu, const std::string& anim_id, const char *axis_name, bool *has_tangents)
-	{
-		std::string source_id = anim_id + get_semantic_suffix(COLLADASW::InputSemantic::INTERPOLATION);
+	enable_fcurves(ob_arm->adt->action, NULL);
 
-		COLLADASW::NameSource source(mSW);
-		source.setId(source_id);
-		source.setArrayId(source_id + ARRAY_ID_SUFFIX);
-		source.setAccessorCount(fcu->totvert);
-		source.setAccessorStride(1);
-		
-		COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
-		param.push_back("INTERPOLATION");
+	source.finish();
 
-		source.prepareToAppendValues();
+	return source_id;
+}
+// only used for sources with OUTPUT semantic ( locations and scale)
+std::string AnimationExporter::create_xyz_source(float *v, int tot, const std::string& anim_id)
+{
+	COLLADASW::InputSemantic::Semantics semantic = COLLADASW::InputSemantic::OUTPUT;
+	std::string source_id = anim_id + get_semantic_suffix(semantic);
 
-		*has_tangents = false;
+	COLLADASW::FloatSourceF source(mSW);
+	source.setId(source_id);
+	source.setArrayId(source_id + ARRAY_ID_SUFFIX);
+	source.setAccessorCount(tot);
+	source.setAccessorStride(3);
 
-		for (unsigned int i = 0; i < fcu->totvert; i++) {
-			if (fcu->bezt[i].ipo==BEZT_IPO_BEZ) {
-				source.appendValues(BEZIER_NAME);
-				*has_tangents = true;
-			} else if (fcu->bezt[i].ipo==BEZT_IPO_CONST) {
-				source.appendValues(STEP_NAME);
-			} else { // BEZT_IPO_LIN
-				source.appendValues(LINEAR_NAME);
-			}
-		}
-		// unsupported? -- HERMITE, CARDINAL, BSPLINE, NURBS
+	COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
+	add_source_parameters(param, semantic, false, NULL, false);
 
-		source.finish();
+	source.prepareToAppendValues();
 
-		return source_id;
+	for (int i = 0; i < tot; i++) {
+		source.appendValues(*v, *(v + 1), *(v + 2));
+		v += 3;
 	}
 
-	std::string AnimationExporter::fake_interpolation_source(int tot, const std::string& anim_id, const char *axis_name)
-	{
-		std::string source_id = anim_id + get_semantic_suffix(COLLADASW::InputSemantic::INTERPOLATION);
+	source.finish();
+
+	return source_id;
+}
+
+std::string AnimationExporter::create_interpolation_source(FCurve *fcu, const std::string& anim_id, const char *axis_name, bool *has_tangents)
+{
+	std::string source_id = anim_id + get_semantic_suffix(COLLADASW::InputSemantic::INTERPOLATION);
+
+	COLLADASW::NameSource source(mSW);
+	source.setId(source_id);
+	source.setArrayId(source_id + ARRAY_ID_SUFFIX);
+	source.setAccessorCount(fcu->totvert);
+	source.setAccessorStride(1);
+
+	COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
+	param.push_back("INTERPOLATION");
 
-		COLLADASW::NameSource source(mSW);
-		source.setId(source_id);
-		source.setArrayId(source_id + ARRAY_ID_SUFFIX);
-		source.setAccessorCount(tot);
-		source.setAccessorStride(1);
-		
-		COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
-		param.push_back("INTERPOLATION");
+	source.prepareToAppendValues();
 
-		source.prepareToAppendValues();
+	*has_tangents = false;
 
-		for (int i = 0; i < tot; i++) {
+	for (unsigned int i = 0; i < fcu->totvert; i++) {
+		if (fcu->bezt[i].ipo==BEZT_IPO_BEZ) {
+			source.appendValues(BEZIER_NAME);
+			*has_tangents = true;
+		} else if (fcu->bezt[i].ipo==BEZT_IPO_CONST) {
+			source.appendValues(STEP_NAME);
+		} else { // BEZT_IPO_LIN
 			source.appendValues(LINEAR_NAME);
 		}
+	}
+	// unsupported? -- HERMITE, CARDINAL, BSPLINE, NURBS
+
+	source.finish();
+
+	return source_id;
+}
+
+std::string AnimationExporter::fake_interpolation_source(int tot, const std::string& anim_id, const char *axis_name)
+{
+	std::string source_id = anim_id + get_semantic_suffix(COLLADASW::InputSemantic::INTERPOLATION);
+
+	COLLADASW::NameSource source(mSW);
+	source.setId(source_id);
+	source.setArrayId(source_id + ARRAY_ID_SUFFIX);
+	source.setAccessorCount(tot);
+	source.setAccessorStride(1);
+
+	COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
+	param.push_back("INTERPOLATION");
 
-		source.finish();
+	source.prepareToAppendValues();
 
-		return source_id;
+	for (int i = 0; i < tot; i++) {
+		source.appendValues(LINEAR_NAME);
 	}
 
-	std::string AnimationExporter::get_light_param_sid(char *rna_path, int tm_type, const char *axis_name, bool append_axis)
-	{
-		std::string tm_name;
-		// when given rna_path, determine tm_type from it
-		if (rna_path) {
-			char *name = extract_transform_name(rna_path);
-
-			if (!strcmp(name, "color"))
-				tm_type = 1;
-			else if (!strcmp(name, "spot_size"))
-				tm_type = 2;
-			else if (!strcmp(name, "spot_blend"))
-				tm_type = 3;
-			else if (!strcmp(name, "distance"))
-				tm_type = 4;
-			else
-				tm_type = -1;
-		}
+	source.finish();
 
-		switch (tm_type) {
+	return source_id;
+}
+
+std::string AnimationExporter::get_light_param_sid(char *rna_path, int tm_type, const char *axis_name, bool append_axis)
+{
+	std::string tm_name;
+	// when given rna_path, determine tm_type from it
+	if (rna_path) {
+		char *name = extract_transform_name(rna_path);
+
+		if (!strcmp(name, "color"))
+			tm_type = 1;
+		else if (!strcmp(name, "spot_size"))
+			tm_type = 2;
+		else if (!strcmp(name, "spot_blend"))
+			tm_type = 3;
+		else if (!strcmp(name, "distance"))
+			tm_type = 4;
+		else
+			tm_type = -1;
+	}
+
+	switch (tm_type) {
 		case 1:
 			tm_name = "color";
 			break;
@@ -906,43 +906,43 @@ void AnimationExporter::operator() (Object *ob)
 		case 4:
 			tm_name = "blender/blender_dist";
 			break;
-		
+
 		default:
 			tm_name = "";
 			break;
-		}
-	   
-		if (tm_name.size()) {
-			if (axis_name != "")
-				return tm_name + "." + std::string(axis_name);
-			else 
-				return tm_name;
-		}
+	}
 
-		return std::string("");
+	if (tm_name.size()) {
+		if (axis_name != "")
+			return tm_name + "." + std::string(axis_name);
+		else 
+			return tm_name;
 	}
-	
-	std::string AnimationExporter::get_camera_param_sid(char *rna_path, int tm_type, const char *axis_name, bool append_axis)
-	{
-		std::string tm_name;
-		// when given rna_path, determine tm_type from it
-		if (rna_path) {
-			char *name = extract_transform_name(rna_path);
-
-			if (!strcmp(name, "lens"))
-				tm_type = 0;
-			else if (!strcmp(name, "ortho_scale"))
-				tm_type = 1;
-			else if (!strcmp(name, "clip_end"))
-				tm_type = 2;
-			else if (!strcmp(name, "clip_start"))
-				tm_type = 3;
-			
-			else
-				tm_type = -1;
-		}
 
-		switch (tm_type) {
+	return std::string("");
+}
+
+std::string AnimationExporter::get_camera_param_sid(char *rna_path, int tm_type, const char *axis_name, bool append_axis)
+{
+	std::string tm_name;
+	// when given rna_path, determine tm_type from it
+	if (rna_path) {
+		char *name = extract_transform_name(rna_path);
+
+		if (!strcmp(name, "lens"))
+			tm_type = 0;
+		else if (!strcmp(name, "ortho_scale"))
+			tm_type = 1;
+		else if (!strcmp(name, "clip_end"))
+			tm_type = 2;
+		else if (!strcmp(name, "clip_start"))
+			tm_type = 3;
+
+		else
+			tm_type = -1;
+	}
+
+	switch (tm_type) {
 		case 0:
 			tm_name = "xfov";
 			break;
@@ -955,56 +955,56 @@ void AnimationExporter::operator() (Object *ob)
 		case 3:
 			tm_name = "znear";
 			break;
-		
+
 		default:
 			tm_name = "";
 			break;
-		}
-	   
-		if (tm_name.size()) {
-			if (axis_name != "")
-				return tm_name + "." + std::string(axis_name);
-			else 
-				return tm_name;
-		}
+	}
 
-		return std::string("");
+	if (tm_name.size()) {
+		if (axis_name != "")
+			return tm_name + "." + std::string(axis_name);
+		else 
+			return tm_name;
 	}
 
-	// Assign sid of the animated parameter or transform 
-	// for rotation, axis name is always appended and the value of append_axis is ignored
-	std::string AnimationExporter::get_transform_sid(char *rna_path, int tm_type, const char *axis_name, bool append_axis)
-	{
-		std::string tm_name;
-		bool is_rotation =false;
-		// when given rna_path, determine tm_type from it
-		if (rna_path) {
-			char *name = extract_transform_name(rna_path);
-
-			if (!strcmp(name, "rotation_euler"))
-				tm_type = 0;
-			else if (!strcmp(name, "rotation_quaternion"))
-				tm_type = 1;
-			else if (!strcmp(name, "scale"))
-				tm_type = 2;
-			else if (!strcmp(name, "location"))
-				tm_type = 3;
-			else if (!strcmp(name, "specular_hardness"))
-				tm_type = 4;
-			else if (!strcmp(name, "specular_color"))
-				tm_type = 5;
-			else if (!strcmp(name, "diffuse_color"))
-				tm_type = 6;
-			else if (!strcmp(name, "alpha"))
-				tm_type = 7;
-			else if (!strcmp(name, "ior"))
-				tm_type = 8;
-			
-			else
-				tm_type = -1;
-		}
+	return std::string("");
+}
+
+// Assign sid of the animated parameter or transform 
+// for rotation, axis name is always appended and the value of append_axis is ignored
+std::string AnimationExporter::get_transform_sid(char *rna_path, int tm_type, const char *axis_name, bool append_axis)
+{
+	std::string tm_name;
+	bool is_rotation =false;
+	// when given rna_path, determine tm_type from it
+	if (rna_path) {
+		char *name = extract_transform_name(rna_path);
+
+		if (!strcmp(name, "rotation_euler"))
+			tm_type = 0;
+		else if (!strcmp(name, "rotation_quaternion"))
+			tm_type = 1;
+		else if (!strcmp(name, "scale"))
+			tm_type = 2;
+		else if (!strcmp(name, "location"))
+			tm_type = 3;
+		else if (!strcmp(name, "specular_hardness"))
+			tm_type = 4;
+		else if (!strcmp(name, "specular_color"))
+			tm_type = 5;
+		else if (!strcmp(name, "diffuse_color"))
+			tm_type = 6;
+		else if (!strcmp(name, "alpha"))
+			tm_type = 7;
+		else if (!strcmp(name, "ior"))
+			tm_type = 8;
 
-		switch (tm_type) {
+		else
+			tm_type = -1;
+	}
+
+	switch (tm_type) {
 		case 0:
 		case 1:
 			tm_name = "rotation";
@@ -1031,173 +1031,173 @@ void AnimationExporter::operator() (Object *ob)
 		case 8:
 			tm_name = "index_of_refraction";
 			break;	
-		
+
 		default:
 			tm_name = "";
 			break;
-		}
-	   
-		if (tm_name.size()) {
-			if (is_rotation)
-				return tm_name + std::string(axis_name) + ".ANGLE";
-			else
-				if (axis_name != "")
-					return tm_name + "." + std::string(axis_name);
-				else 
-					return tm_name;
-		}
-
-		return std::string("");
 	}
 
-	char* AnimationExporter::extract_transform_name(char *rna_path)
-	{
-		char *dot = strrchr(rna_path, '.');
-		return dot ? (dot + 1) : rna_path;
+	if (tm_name.size()) {
+		if (is_rotation)
+			return tm_name + std::string(axis_name) + ".ANGLE";
+		else
+			if (axis_name != "")
+				return tm_name + "." + std::string(axis_name);
+			else 
+				return tm_name;
 	}
 
-	//find keyframes of all the objects animations
-	void AnimationExporter::find_frames(Object *ob, std::vector<float> &fra)
-	{
-		FCurve *fcu= (FCurve*)ob->adt->action->curves.first;
+	return std::string("");
+}
 
-		for (; fcu; fcu = fcu->next) {
-			
-			for (unsigned int i = 0; i < fcu->totvert; i++) {
-				float f = fcu->bezt[i].vec[1][0];     //
-				if (std::find(fra.begin(), fra.end(), f) == fra.end())   
-					fra.push_back(f);
-			}
-		}
+char* AnimationExporter::extract_transform_name(char *rna_path)
+{
+	char *dot = strrchr(rna_path, '.');
+	return dot ? (dot + 1) : rna_path;
+}
 
-		// keep the keys in ascending order
-		std::sort(fra.begin(), fra.end());
-	}
+//find keyframes of all the objects animations
+void AnimationExporter::find_frames(Object *ob, std::vector<float> &fra)
+{
+	FCurve *fcu= (FCurve*)ob->adt->action->curves.first;
 
-		
+	for (; fcu; fcu = fcu->next) {
 
-	// enable fcurves driving a specific bone, disable all the rest
-	// if bone_name = NULL enable all fcurves
-	void AnimationExporter::enable_fcurves(bAction *act, char *bone_name)
-	{
-		FCurve *fcu;
-		char prefix[200];
-
-		if (bone_name)
-			BLI_snprintf(prefix, sizeof(prefix), "pose.bones[\"%s\"]", bone_name);
-
-		for (fcu = (FCurve*)act->curves.first; fcu; fcu = fcu->next) {
-			if (bone_name) {
-				if (!strncmp(fcu->rna_path, prefix, strlen(prefix)))
-					fcu->flag &= ~FCURVE_DISABLED;
-				else
-					fcu->flag |= FCURVE_DISABLED;
-			}
-			else {
-				fcu->flag &= ~FCURVE_DISABLED;
-			}
+		for (unsigned int i = 0; i < fcu->totvert; i++) {
+			float f = fcu->bezt[i].vec[1][0];
+			if (std::find(fra.begin(), fra.end(), f) == fra.end())   
+				fra.push_back(f);
 		}
 	}
-	
-	bool AnimationExporter::hasAnimations(Scene *sce)
-	{
-		Base *base= (Base*) sce->base.first;
-		
-		while(base) {
-			Object *ob = base->object;
-			
-			FCurve *fcu = 0;
-			//Check for object transform animations
-			if(ob->adt && ob->adt->action)      
-				fcu = (FCurve*)ob->adt->action->curves.first;
-			//Check for Lamp parameter animations
-			else if( (ob->type == OB_LAMP ) && ((Lamp*)ob ->data)->adt && ((Lamp*)ob ->data)->adt->action )
-				fcu = (FCurve*)(((Lamp*)ob ->data)->adt->action->curves.first);
-			//Check for Camera parameter animations
-			else if( (ob->type == OB_CAMERA ) && ((Camera*)ob ->data)->adt && ((Camera*)ob ->data)->adt->action )
-				fcu = (FCurve*)(((Camera*)ob ->data)->adt->action->curves.first);
-			
-			//Check Material Effect parameter animations.
-			for(int a = 0; a < ob->totcol; a++)
-			{
-				Material *ma = give_current_material(ob, a+1);
-				if (!ma) continue;
-				if(ma->adt && ma->adt->action)
-				{
-					fcu = (FCurve*)ma->adt->action->curves.first;	
-				}
-			}
 
-			if ( fcu) 
-				return true;
-			base= base->next;
+	// keep the keys in ascending order
+	std::sort(fra.begin(), fra.end());
+}
+
+
+
+// enable fcurves driving a specific bone, disable all the rest
+// if bone_name = NULL enable all fcurves
+void AnimationExporter::enable_fcurves(bAction *act, char *bone_name)
+{
+	FCurve *fcu;
+	char prefix[200];
+
+	if (bone_name)
+		BLI_snprintf(prefix, sizeof(prefix), "pose.bones[\"%s\"]", bone_name);
+
+	for (fcu = (FCurve*)act->curves.first; fcu; fcu = fcu->next) {
+		if (bone_name) {
+			if (!strncmp(fcu->rna_path, prefix, strlen(prefix)))
+				fcu->flag &= ~FCURVE_DISABLED;
+			else
+				fcu->flag |= FCURVE_DISABLED;
+		}
+		else {
+			fcu->flag &= ~FCURVE_DISABLED;
 		}
-		return false;
 	}
+}
 
-	//------------------------------- Not used in the new system.--------------------------------------------------------
-	void AnimationExporter::find_rotation_frames(Object *ob, std::vector<float> &fra, const char *prefix, int rotmode)
-	{
-		if (rotmode > 0)
-			find_frames(ob, fra, prefix, "rotation_euler");
-		else if (rotmode == ROT_MODE_QUAT)
-			find_frames(ob, fra, prefix, "rotation_quaternion");
-		/*else if (rotmode == ROT_MODE_AXISANGLE)
-			;*/
-	}
+bool AnimationExporter::hasAnimations(Scene *sce)
+{
+	Base *base= (Base*) sce->base.first;
 
-	void AnimationExporter::find_frames(Object *ob, std::vector<float> &fra, const char *prefix, const char *tm_name)
-	{
-		FCurve *fcu= (FCurve*)ob->adt->action->curves.first;
-
-		for (; fcu; fcu = fcu->next) {
-			if (prefix && strncmp(prefix, fcu->rna_path, strlen(prefix)))
-				continue;
-
-			char *name = extract_transform_name(fcu->rna_path);
-			if (!strcmp(name, tm_name)) {
-				for (unsigned int i = 0; i < fcu->totvert; i++) {
-					float f = fcu->bezt[i].vec[1][0];     //
-					if (std::find(fra.begin(), fra.end(), f) == fra.end())   
-						fra.push_back(f);
-				}
+	while(base) {
+		Object *ob = base->object;
+
+		FCurve *fcu = 0;
+		//Check for object transform animations
+		if(ob->adt && ob->adt->action)
+			fcu = (FCurve*)ob->adt->action->curves.first;
+		//Check for Lamp parameter animations
+		else if( (ob->type == OB_LAMP ) && ((Lamp*)ob ->data)->adt && ((Lamp*)ob ->data)->adt->action )
+			fcu = (FCurve*)(((Lamp*)ob ->data)->adt->action->curves.first);
+		//Check for Camera parameter animations
+		else if( (ob->type == OB_CAMERA ) && ((Camera*)ob ->data)->adt && ((Camera*)ob ->data)->adt->action )
+			fcu = (FCurve*)(((Camera*)ob ->data)->adt->action->curves.first);
+
+		//Check Material Effect parameter animations.
+		for(int a = 0; a < ob->totcol; a++)
+		{
+			Material *ma = give_current_material(ob, a+1);
+			if (!ma) continue;
+			if(ma->adt && ma->adt->action)
+			{
+				fcu = (FCurve*)ma->adt->action->curves.first;	
 			}
 		}
 
-		// keep the keys in ascending order
-		std::sort(fra.begin(), fra.end());
+		if ( fcu) 
+			return true;
+		base= base->next;
 	}
+	return false;
+}
 
-	void AnimationExporter::write_bone_animation(Object *ob_arm, Bone *bone)
-	{
-		if (!ob_arm->adt)
-			return;
-		
-		//write bone animations for 3 transform types
-		//i=0 --> rotations
-		//i=1 --> scale
-		//i=2 --> location
-		for (int i = 0; i < 3; i++)
-			sample_and_write_bone_animation(ob_arm, bone, i);
-		
-		for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next)
-			write_bone_animation(ob_arm, child);
+//------------------------------- Not used in the new system.--------------------------------------------------------
+void AnimationExporter::find_rotation_frames(Object *ob, std::vector<float> &fra, const char *prefix, int rotmode)
+{
+	if (rotmode > 0)
+		find_frames(ob, fra, prefix, "rotation_euler");
+	else if (rotmode == ROT_MODE_QUAT)
+		find_frames(ob, fra, prefix, "rotation_quaternion");
+	/*else if (rotmode == ROT_MODE_AXISANGLE)
+	;*/
+}
+
+void AnimationExporter::find_frames(Object *ob, std::vector<float> &fra, const char *prefix, const char *tm_name)
+{
+	FCurve *fcu= (FCurve*)ob->adt->action->curves.first;
+
+	for (; fcu; fcu = fcu->next) {
+		if (prefix && strncmp(prefix, fcu->rna_path, strlen(prefix)))
+			continue;
+
+		char *name = extract_transform_name(fcu->rna_path);
+		if (!strcmp(name, tm_name)) {
+			for (unsigned int i = 0; i < fcu->totvert; i++) {
+				float f = fcu->bezt[i].vec[1][0];
+				if (std::find(fra.begin(), fra.end(), f) == fra.end())   
+					fra.push_back(f);
+			}
+		}
 	}
 
-	void AnimationExporter::sample_and_write_bone_animation(Object *ob_arm, Bone *bone, int transform_type)
-	{
-		bArmature *arm = (bArmature*)ob_arm->data;
-		int flag = arm->flag;
-		std::vector<float> fra;
-		char prefix[256];
+	// keep the keys in ascending order
+	std::sort(fra.begin(), fra.end());
+}
 
-		BLI_snprintf(prefix, sizeof(prefix), "pose.bones[\"%s\"]", bone->name);
+void AnimationExporter::write_bone_animation(Object *ob_arm, Bone *bone)
+{
+	if (!ob_arm->adt)
+		return;
+
+	//write bone animations for 3 transform types
+	//i=0 --> rotations
+	//i=1 --> scale
+	//i=2 --> location
+	for (int i = 0; i < 3; i++)
+		sample_and_write_bone_animation(ob_arm, bone, i);
+
+	for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next)
+		write_bone_animation(ob_arm, child);
+}
 
-		bPoseChannel *pchan = get_pose_channel(ob_arm->pose, bone->name);
-		if (!pchan)
-			return;
-		//Fill frame array with key frame values framed at @param:transform_type
-		switch (transform_type) {
+void AnimationExporter::sample_and_write_bone_animation(Object *ob_arm, Bone *bone, int transform_type)
+{
+	bArmature *arm = (bArmature*)ob_arm->data;
+	int flag = arm->flag;
+	std::vector<float> fra;
+	char prefix[256];
+
+	BLI_snprintf(prefix, sizeof(prefix), "pose.bones[\"%s\"]", bone->name);
+
+	bPoseChannel *pchan = get_pose_channel(ob_arm->pose, bone->name);
+	if (!pchan)
+		return;
+	//Fill frame array with key frame values framed at @param:transform_type
+	switch (transform_type) {
 		case 0:
 			find_rotation_frames(ob_arm, fra, prefix, pchan->rotmode);
 			break;
@@ -1209,77 +1209,77 @@ void AnimationExporter::operator() (Object *ob)
 			break;
 		default:
 			return;
-		}
+	}
 
-		// exit rest position
-		if (flag & ARM_RESTPOS) {
-			arm->flag &= ~ARM_RESTPOS;
-			where_is_pose(scene, ob_arm);
-		}
-		//v array will hold all values which will be exported. 
-		if (fra.size()) {
-			float *values = (float*)MEM_callocN(sizeof(float) * 3 * fra.size(), "temp. anim frames");
-			sample_animation(values, fra, transform_type, bone, ob_arm, pchan);
-
-			if (transform_type == 0) {
-				// write x, y, z curves separately if it is rotation
-				float *axisValues = (float*)MEM_callocN(sizeof(float) * fra.size(), "temp. anim frames");   
-			
-				for (int i = 0; i < 3; i++) {
-					for (unsigned int j = 0; j < fra.size(); j++)
-						axisValues[j] = values[j * 3 + i];
-
-					dae_bone_animation(fra, axisValues, transform_type, i, id_name(ob_arm), bone->name);
-				}
-				MEM_freeN(axisValues);
-			}
-			else {
-				// write xyz at once if it is location or scale
-				dae_bone_animation(fra, values, transform_type, -1, id_name(ob_arm), bone->name);
-			}
+	// exit rest position
+	if (flag & ARM_RESTPOS) {
+		arm->flag &= ~ARM_RESTPOS;
+		where_is_pose(scene, ob_arm);
+	}
+	//v array will hold all values which will be exported. 
+	if (fra.size()) {
+		float *values = (float*)MEM_callocN(sizeof(float) * 3 * fra.size(), "temp. anim frames");
+		sample_animation(values, fra, transform_type, bone, ob_arm, pchan);
 
-			MEM_freeN(values);
+		if (transform_type == 0) {
+			// write x, y, z curves separately if it is rotation
+			float *axisValues = (float*)MEM_callocN(sizeof(float) * fra.size(), "temp. anim frames");   
+
+			for (int i = 0; i < 3; i++) {
+				for (unsigned int j = 0; j < fra.size(); j++)
+					axisValues[j] = values[j * 3 + i];
+
+				dae_bone_animation(fra, axisValues, transform_type, i, id_name(ob_arm), bone->name);
+			}
+			MEM_freeN(axisValues);
+		}
+		else {
+			// write xyz at once if it is location or scale
+			dae_bone_animation(fra, values, transform_type, -1, id_name(ob_arm), bone->name);
 		}
 
-		// restore restpos
-		if (flag & ARM_RESTPOS) 
-			arm->flag = flag;
-		where_is_pose(scene, ob_arm);
+		MEM_freeN(values);
 	}
 
-	void AnimationExporter::sample_animation(float *v, std::vector<float> &frames, int type, Bone *bone, Object *ob_arm, bPoseChannel *pchan)
-	{
-		bPoseChannel *parchan = NULL;
-		bPose *pose = ob_arm->pose;
+	// restore restpos
+	if (flag & ARM_RESTPOS) 
+		arm->flag = flag;
+	where_is_pose(scene, ob_arm);
+}
 
-		pchan = get_pose_channel(pose, bone->name);
+void AnimationExporter::sample_animation(float *v, std::vector<float> &frames, int type, Bone *bone, Object *ob_arm, bPoseChannel *pchan)
+{
+	bPoseChannel *parchan = NULL;
+	bPose *pose = ob_arm->pose;
 
-		if (!pchan)
-			return;
+	pchan = get_pose_channel(pose, bone->name);
 
-		parchan = pchan->parent;
+	if (!pchan)
+		return;
 
-		enable_fcurves(ob_arm->adt->action, bone->name);
+	parchan = pchan->parent;
 
-		std::vector<float>::iterator it;
-		for (it = frames.begin(); it != frames.end(); it++) {
-			float mat[4][4], ipar[4][4];
+	enable_fcurves(ob_arm->adt->action, bone->name);
 
-			float ctime = bsystem_time(scene, ob_arm, *it, 0.0f);
+	std::vector<float>::iterator it;
+	for (it = frames.begin(); it != frames.end(); it++) {
+		float mat[4][4], ipar[4][4];
 
+		float ctime = bsystem_time(scene, ob_arm, *it, 0.0f);
 
-			BKE_animsys_evaluate_animdata(scene , &ob_arm->id, ob_arm->adt, ctime, ADT_RECALC_ANIM);
-			where_is_pose_bone(scene, ob_arm, pchan, ctime, 1);
 
-			// compute bone local mat
-			if (bone->parent) {
-				invert_m4_m4(ipar, parchan->pose_mat);
-				mul_m4_m4m4(mat, pchan->pose_mat, ipar);
-			}
-			else
-				copy_m4_m4(mat, pchan->pose_mat);
+		BKE_animsys_evaluate_animdata(scene , &ob_arm->id, ob_arm->adt, ctime, ADT_RECALC_ANIM);
+		where_is_pose_bone(scene, ob_arm, pchan, ctime, 1);
+
+		// compute bone local mat
+		if (bone->parent) {
+			invert_m4_m4(ipar, parchan->pose_mat);
+			mul_m4_m4m4(mat, pchan->pose_mat, ipar);
+		}
+		else
+			copy_m4_m4(mat, pchan->pose_mat);
 
-			switch (type) {
+		switch (type) {
 			case 0:
 				mat4_to_eul(v, mat);
 				break;
@@ -1289,12 +1289,10 @@ void AnimationExporter::operator() (Object *ob)
 			case 2:
 				copy_v3_v3(v, mat[3]);
 				break;
-			}
-
-			v += 3;
 		}
 
-		enable_fcurves(ob_arm->adt->action, NULL);
+		v += 3;
 	}
 
-
+	enable_fcurves(ob_arm->adt->action, NULL);
+}
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp
index 4a3cd5eeb06..db32664f736 100644
--- a/source/blender/collada/AnimationImporter.cpp
+++ b/source/blender/collada/AnimationImporter.cpp
@@ -89,17 +89,17 @@ void AnimationImporter::animation_to_fcurves(COLLADAFW::AnimationCurve *curve)
 {
 	COLLADAFW::FloatOrDoubleArray& input = curve->getInputValues();
 	COLLADAFW::FloatOrDoubleArray& output = curve->getOutputValues();
-    
+
 	if( curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER ||
 		curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_STEP ) {
-	COLLADAFW::FloatOrDoubleArray& intan = curve->getInTangentValues();
-    COLLADAFW::FloatOrDoubleArray& outtan = curve->getOutTangentValues();
+			COLLADAFW::FloatOrDoubleArray& intan = curve->getInTangentValues();
+			COLLADAFW::FloatOrDoubleArray& outtan = curve->getOutTangentValues();
 	}
 
 	float fps = (float)FPS;
 	size_t dim = curve->getOutDimension();
 	unsigned int i;
-	
+
 	std::vector<FCurve*>& fcurves = curve_map[curve->getUniqueId()];
 
 	switch (dim) {
@@ -110,18 +110,18 @@ void AnimationImporter::animation_to_fcurves(COLLADAFW::AnimationCurve *curve)
 		{
 			for (i = 0; i < dim; i++ ) {
 				FCurve *fcu = (FCurve*)MEM_callocN(sizeof(FCurve), "FCurve");
-			
+
 				fcu->flag = (FCURVE_VISIBLE|FCURVE_AUTO_HANDLES|FCURVE_SELECTED);
 				// fcu->rna_path = BLI_strdupn(path, strlen(path));
 				fcu->array_index = 0;
 				fcu->totvert = curve->getKeyCount();
-			
+
 				// create beztriple for each key
 				for (unsigned int j = 0; j < curve->getKeyCount(); j++) {
 					BezTriple bez;
 					memset(&bez, 0, sizeof(BezTriple));
 
-					
+
 					// input, output
 					bez.vec[1][0] = bc_get_float_value(input, j) * fps; 
 					bez.vec[1][1] = bc_get_float_value(output, j * dim + i);
@@ -131,20 +131,20 @@ void AnimationImporter::animation_to_fcurves(COLLADAFW::AnimationCurve *curve)
 						curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_STEP) 
 					{
 						COLLADAFW::FloatOrDoubleArray& intan = curve->getInTangentValues();
-                        COLLADAFW::FloatOrDoubleArray& outtan = curve->getOutTangentValues();
+						COLLADAFW::FloatOrDoubleArray& outtan = curve->getOutTangentValues();
 
 						// intangent
-						 bez.vec[0][0] = bc_get_float_value(intan, (j * 2 * dim ) + (2 * i)) * fps;
-						 bez.vec[0][1] = bc_get_float_value(intan, (j * 2 * dim )+ (2 * i) + 1);
+						bez.vec[0][0] = bc_get_float_value(intan, (j * 2 * dim ) + (2 * i)) * fps;
+						bez.vec[0][1] = bc_get_float_value(intan, (j * 2 * dim )+ (2 * i) + 1);
 
-						 // outtangent
-						 bez.vec[2][0] = bc_get_float_value(outtan, (j * 2 * dim ) + (2 * i)) * fps;
-						 bez.vec[2][1] = bc_get_float_value(outtan, (j * 2 * dim )+ (2 * i) + 1);
-						 if(curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER) 
+						// outtangent
+						bez.vec[2][0] = bc_get_float_value(outtan, (j * 2 * dim ) + (2 * i)) * fps;
+						bez.vec[2][1] = bc_get_float_value(outtan, (j * 2 * dim )+ (2 * i) + 1);
+						if(curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER) 
 							bez.ipo = BEZT_IPO_BEZ;
-						 else 
-							 bez.ipo = BEZT_IPO_CONST;
-						 //bez.h1 = bez.h2 = HD_AUTO; 	
+						else 
+							bez.ipo = BEZT_IPO_CONST;
+						//bez.h1 = bez.h2 = HD_AUTO; 	
 					}
 					else 
 					{
@@ -153,7 +153,7 @@ void AnimationImporter::animation_to_fcurves(COLLADAFW::AnimationCurve *curve)
 					}
 					// bez.ipo = U.ipo_new; /* use default interpolation mode here... */
 					bez.f1 = bez.f2 = bez.f3 = SELECT;
-					
+
 					insert_bezt_fcurve(fcu, &bez, 0);
 				}
 
@@ -306,9 +306,9 @@ bool AnimationImporter::write_animation(const COLLADAFW::Animation* anim)
 bool AnimationImporter::write_animation_list(const COLLADAFW::AnimationList* animlist) 
 {
 	const COLLADAFW::UniqueId& animlist_id = animlist->getUniqueId();
-    
+
 	animlist_map[animlist_id] = animlist;
-    
+
 #if 0
 
 	// should not happen
@@ -317,10 +317,10 @@ bool AnimationImporter::write_animation_list(const COLLADAFW::AnimationList* ani
 	}
 
 	// for bones rna_path is like: pose.bones["bone-name"].rotation
-	
+
 
 #endif
-	
+
 	return true;
 }
 
@@ -433,7 +433,7 @@ virtual void AnimationImporter::change_eul_to_quat(Object *ob, bAction *act)
 
 //sets the rna_path and array index to curve
 void AnimationImporter::modify_fcurve(std::vector<FCurve*>* curves , char* rna_path , int array_index )
-{   
+{
 	std::vector<FCurve*>::iterator it;
 	int i;
 	for (it = curves->begin(), i = 0; it != curves->end(); it++, i++) {
@@ -450,18 +450,18 @@ void AnimationImporter::modify_fcurve(std::vector<FCurve*>* curves , char* rna_p
 void AnimationImporter::find_frames( std::vector<float>* frames , std::vector<FCurve*>* curves)
 {
 	std::vector<FCurve*>::iterator iter;
-		for (iter = curves->begin(); iter != curves->end(); iter++) {
-			FCurve *fcu = *iter;
-        
-			for (unsigned int k = 0; k < fcu->totvert; k++) {
-				//get frame value from bezTriple
-				float fra = fcu->bezt[k].vec[1][0];
-				//if frame already not added add frame to frames
-				if (std::find(frames->begin(), frames->end(), fra) == frames->end())
-					frames->push_back(fra);
-								
-			}
+	for (iter = curves->begin(); iter != curves->end(); iter++) {
+		FCurve *fcu = *iter;
+
+		for (unsigned int k = 0; k < fcu->totvert; k++) {
+			//get frame value from bezTriple
+			float fra = fcu->bezt[k].vec[1][0];
+			//if frame already not added add frame to frames
+			if (std::find(frames->begin(), frames->end(), fra) == frames->end())
+				frames->push_back(fra);
+
 		}
+	}
 }
 
 //creates the rna_paths and array indices of fcurves from animations using transformation and bound animation class of each animation.
@@ -472,18 +472,18 @@ void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation *
 	COLLADAFW::Transformation::TransformationType tm_type = transform->getTransformationType();
 	bool is_matrix = tm_type == COLLADAFW::Transformation::MATRIX;
 	bool is_rotation = tm_type  == COLLADAFW::Transformation::ROTATE;
-	
+
 	//to check if the no of curves are valid
 	bool xyz = ((tm_type == COLLADAFW::Transformation::TRANSLATE ||tm_type  == COLLADAFW::Transformation::SCALE) && binding->animationClass == COLLADAFW::AnimationList::POSITION_XYZ);
-                        
-	
+
+
 	if (!((!xyz && curves->size() == 1) || (xyz && curves->size() == 3) || is_matrix)) {
 		fprintf(stderr, "expected %d curves, got %d\n", xyz ? 3 : 1, (int)curves->size());
 		return;
 	}
-    	
+
 	char rna_path[100];
-							
+
 	switch (tm_type) {
 		case COLLADAFW::Transformation::TRANSLATE:
 		case COLLADAFW::Transformation::SCALE:
@@ -495,80 +495,80 @@ void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation *
 					BLI_strncpy(rna_path, loc ? "location" : "scale", sizeof(rna_path));
 
 				switch (binding->animationClass) {
-					case COLLADAFW::AnimationList::POSITION_X:
-						modify_fcurve(curves, rna_path, 0 );
-						break;
-					case COLLADAFW::AnimationList::POSITION_Y:
-						modify_fcurve(curves, rna_path, 1 );
-						break;
-					case COLLADAFW::AnimationList::POSITION_Z:
-						modify_fcurve(curves, rna_path, 2 );
-						break;
-					case COLLADAFW::AnimationList::POSITION_XYZ:
-						modify_fcurve(curves, rna_path, -1 );
-						break;
-					default:
-						fprintf(stderr, "AnimationClass %d is not supported for %s.\n",
-								binding->animationClass, loc ? "TRANSLATE" : "SCALE");
-					}
-		break;
+		case COLLADAFW::AnimationList::POSITION_X:
+			modify_fcurve(curves, rna_path, 0 );
+			break;
+		case COLLADAFW::AnimationList::POSITION_Y:
+			modify_fcurve(curves, rna_path, 1 );
+			break;
+		case COLLADAFW::AnimationList::POSITION_Z:
+			modify_fcurve(curves, rna_path, 2 );
+			break;
+		case COLLADAFW::AnimationList::POSITION_XYZ:
+			modify_fcurve(curves, rna_path, -1 );
+			break;
+		default:
+			fprintf(stderr, "AnimationClass %d is not supported for %s.\n",
+				binding->animationClass, loc ? "TRANSLATE" : "SCALE");
+				}
+				break;
 			}
-		
-		
+
+
 		case COLLADAFW::Transformation::ROTATE:
 			{
 				if (is_joint)
 					BLI_snprintf(rna_path, sizeof(rna_path), "%s.rotation_euler", joint_path);
 				else
 					BLI_strncpy(rna_path, "rotation_euler", sizeof(rna_path));
-                std::vector<FCurve*>::iterator iter;
+				std::vector<FCurve*>::iterator iter;
 				for (iter = curves->begin(); iter != curves->end(); iter++) {
 					FCurve* fcu = *iter;
-	                                
+
 					//if transform is rotation the fcurves values must be turned in to radian.
 					if (is_rotation)
 						fcurve_deg_to_rad(fcu);		 
 				}					
 				COLLADAFW::Rotate* rot = (COLLADAFW::Rotate*)transform;
 				COLLADABU::Math::Vector3& axis = rot->getRotationAxis();
-			
+
 				switch (binding->animationClass) {
-					case COLLADAFW::AnimationList::ANGLE:
-						if (COLLADABU::Math::Vector3::UNIT_X == axis) {
-							modify_fcurve(curves, rna_path, 0 );
-						}
-						else if (COLLADABU::Math::Vector3::UNIT_Y == axis) {
-							modify_fcurve(curves, rna_path, 1 );
-						}
-						else if (COLLADABU::Math::Vector3::UNIT_Z == axis) {
-							modify_fcurve(curves, rna_path, 2 );
-						}
-						break;
-					case COLLADAFW::AnimationList::AXISANGLE:
-						// TODO convert axis-angle to quat? or XYZ?
-					default:
-						fprintf(stderr, "AnimationClass %d is not supported for ROTATE transformation.\n",
-								binding->animationClass);
-					}
+		case COLLADAFW::AnimationList::ANGLE:
+			if (COLLADABU::Math::Vector3::UNIT_X == axis) {
+				modify_fcurve(curves, rna_path, 0 );
+			}
+			else if (COLLADABU::Math::Vector3::UNIT_Y == axis) {
+				modify_fcurve(curves, rna_path, 1 );
+			}
+			else if (COLLADABU::Math::Vector3::UNIT_Z == axis) {
+				modify_fcurve(curves, rna_path, 2 );
+			}
 			break;
+		case COLLADAFW::AnimationList::AXISANGLE:
+			// TODO convert axis-angle to quat? or XYZ?
+		default:
+			fprintf(stderr, "AnimationClass %d is not supported for ROTATE transformation.\n",
+				binding->animationClass);
+				}
+				break;
 			}
-			
+
 		case COLLADAFW::Transformation::MATRIX:
 			/*{
-				COLLADAFW::Matrix* mat = (COLLADAFW::Matrix*)transform;
-				COLLADABU::Math::Matrix4 mat4 = mat->getMatrix();
-				switch (binding->animationClass) {
-					case COLLADAFW::AnimationList::TRANSFORM:
-					
-				}
+			COLLADAFW::Matrix* mat = (COLLADAFW::Matrix*)transform;
+			COLLADABU::Math::Matrix4 mat4 = mat->getMatrix();
+			switch (binding->animationClass) {
+			case COLLADAFW::AnimationList::TRANSFORM:
+
+			}
 			}*/
 			break;
 		case COLLADAFW::Transformation::SKEW:
 		case COLLADAFW::Transformation::LOOKAT:
 			fprintf(stderr, "Animation of SKEW and LOOKAT transformations is not supported yet.\n");
 			break;
-		}
-	
+	}
+
 }
 
 //creates the rna_paths and array indices of fcurves from animations using color and bound animation class of each animation.
@@ -576,15 +576,15 @@ void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId& list
 {
 	char rna_path[100];
 	BLI_strncpy(rna_path,anim_type, sizeof(rna_path));
-    
+
 	const COLLADAFW::AnimationList *animlist = animlist_map[listid];
 	const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
-				//all the curves belonging to the current binding
-	std::vector<FCurve*> animcurves;    
+	//all the curves belonging to the current binding
+	std::vector<FCurve*> animcurves;
 	for (unsigned int j = 0; j < bindings.getCount(); j++) {
-		 animcurves = curve_map[bindings[j].animation];
-		
-	    switch (bindings[j].animationClass) {
+		animcurves = curve_map[bindings[j].animation];
+
+		switch (bindings[j].animationClass) {
 		case COLLADAFW::AnimationList::COLOR_R:
 			modify_fcurve(&animcurves, rna_path, 0 );
 			break;
@@ -598,13 +598,13 @@ void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId& list
 		case COLLADAFW::AnimationList::COLOR_RGBA: // to do-> set intensity
 			modify_fcurve(&animcurves, rna_path, -1 );
 			break;
-			
+
 		default:
 			fprintf(stderr, "AnimationClass %d is not supported for %s.\n",
-					bindings[j].animationClass, "COLOR" );
+				bindings[j].animationClass, "COLOR" );
 		}
 
-		 std::vector<FCurve*>::iterator iter;
+		std::vector<FCurve*>::iterator iter;
 		//Add the curves of the current animation to the object
 		for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
 			FCurve * fcu = *iter;
@@ -612,7 +612,7 @@ void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId& list
 		}	 			
 	}
 
-	
+
 }
 
 void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId& listid, ListBase *AnimCurves, char * anim_type)
@@ -625,7 +625,7 @@ void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId& list
 		const COLLADAFW::AnimationList *animlist = animlist_map[listid];
 		const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
 		//all the curves belonging to the current binding
-		std::vector<FCurve*> animcurves;    
+		std::vector<FCurve*> animcurves;
 		for (unsigned int j = 0; j < bindings.getCount(); j++) {
 			 animcurves = curve_map[bindings[j].animation];
 		
@@ -671,28 +671,28 @@ void AnimationImporter::apply_matrix_curves( Object * ob, std::vector<FCurve*>&
 		copy_m4_m4(rest, bone->arm_mat);
 		invert_m4_m4(irest, rest);
 	}
-    // new curves to assign matrix transform animation
+	// new curves to assign matrix transform animation
 	FCurve *newcu[10]; // if tm_type is matrix, then create 10 curves: 4 rot, 3 loc, 3 scale
 	unsigned int totcu = 10 ;
-    const char *tm_str = NULL;
+	const char *tm_str = NULL;
 	char rna_path[200];
 	for (int i = 0; i < totcu; i++) {
 
 		int axis = i;
 
-			if (i < 4) {
-				tm_str = "rotation_quaternion";
-				axis = i;
-			}
-			else if (i < 7) {
-				tm_str = "location";
-				axis = i - 4;
-			}
-			else {
-				tm_str = "scale";
-				axis = i - 7;
-			}
-		
+		if (i < 4) {
+			tm_str = "rotation_quaternion";
+			axis = i;
+		}
+		else if (i < 7) {
+			tm_str = "location";
+			axis = i - 4;
+		}
+		else {
+			tm_str = "scale";
+			axis = i - 7;
+		}
+
 
 		if (is_joint)
 			BLI_snprintf(rna_path, sizeof(rna_path), "%s.%s", joint_path, tm_str);
@@ -702,11 +702,11 @@ void AnimationImporter::apply_matrix_curves( Object * ob, std::vector<FCurve*>&
 		newcu[i]->totvert = frames.size();
 	}
 
-    if (frames.size() == 0)
+	if (frames.size() == 0)
 		return;
 
-std::sort(frames.begin(), frames.end());
-		
+	std::sort(frames.begin(), frames.end());
+
 	std::vector<float>::iterator it;
 
 	// sample values at each frame
@@ -717,7 +717,7 @@ std::sort(frames.begin(), frames.end());
 		float matfra[4][4];
 
 		unit_m4(matfra);
-        
+
 		// calc object-space mat
 		evaluate_transform_at_frame(matfra, node, fra);
 
@@ -743,23 +743,23 @@ std::sort(frames.begin(), frames.end());
 		}
 
 		float  rot[4], loc[3], scale[3];
-        
-			mat4_to_quat(rot, mat);
-			/*for ( int i = 0 ; i < 4  ;  i ++ )
-			{
-				rot[i] = rot[i] * (180 / M_PI); 
-			}*/
-			copy_v3_v3(loc, mat[3]);
-			mat4_to_size(scale, mat);
-		
+
+		mat4_to_quat(rot, mat);
+		/*for ( int i = 0 ; i < 4  ;  i ++ )
+		{
+		rot[i] = rot[i] * (180 / M_PI); 
+		}*/
+		copy_v3_v3(loc, mat[3]);
+		mat4_to_size(scale, mat);
+
 		// add keys
 		for (int i = 0; i < totcu; i++) {
-				if (i < 4)
-					add_bezt(newcu[i], fra, rot[i]);
-				else if (i < 7)
-					add_bezt(newcu[i], fra, loc[i - 4]);
-				else
-					add_bezt(newcu[i], fra, scale[i - 7]);
+			if (i < 4)
+				add_bezt(newcu[i], fra, rot[i]);
+			else if (i < 7)
+				add_bezt(newcu[i], fra, loc[i - 4]);
+			else
+				add_bezt(newcu[i], fra, scale[i - 7]);
 		}
 	}
 	verify_adt_action((ID*)&ob->id, 1);
@@ -774,13 +774,13 @@ std::sort(frames.begin(), frames.end());
 			BLI_addtail(curves, newcu[i]);
 	}
 
-		if (is_joint) {
-			bPoseChannel *chan = get_pose_channel(ob->pose, bone_name);
-			chan->rotmode = ROT_MODE_QUAT;
-		}
-		else {
-			ob->rotmode = ROT_MODE_QUAT;
-		}
+	if (is_joint) {
+		bPoseChannel *chan = get_pose_channel(ob->pose, bone_name);
+		chan->rotmode = ROT_MODE_QUAT;
+	}
+	else {
+		ob->rotmode = ROT_MODE_QUAT;
+	}
 
 	return;
 
@@ -804,24 +804,24 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node ,
 
 	bAction * act;
 	bActionGroup *grp = NULL;
-    
+
 	if ( (animType->transform) != 0 )
 	{
-    	const char *bone_name = is_joint ? bc_get_joint_name(node) : NULL;
-        char joint_path[200];
+		const char *bone_name = is_joint ? bc_get_joint_name(node) : NULL;
+		char joint_path[200];
 
 		if ( is_joint ) 
-		armature_importer->get_rna_path_for_joint(node, joint_path, sizeof(joint_path));
-		
-	
+			armature_importer->get_rna_path_for_joint(node, joint_path, sizeof(joint_path));
+
+
 		if (!ob->adt || !ob->adt->action) act = verify_adt_action((ID*)&ob->id, 1);
 		else act = ob->adt->action;
-		
-	    //Get the list of animation curves of the object
-	    ListBase *AnimCurves = &(act->curves);
+
+		//Get the list of animation curves of the object
+		ListBase *AnimCurves = &(act->curves);
 
 		const COLLADAFW::TransformationPointerArray& nodeTransforms = node->getTransformations();
-	
+
 		//for each transformation in node 
 		for (unsigned int i = 0; i < nodeTransforms.getCount(); i++) {
 			COLLADAFW::Transformation *transform = nodeTransforms[i];
@@ -829,10 +829,10 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node ,
 
 			bool is_rotation = tm_type == COLLADAFW::Transformation::ROTATE;
 			bool is_matrix = tm_type == COLLADAFW::Transformation::MATRIX;
-				
+
 			const COLLADAFW::UniqueId& listid = transform->getAnimationList();
-		
-			//check if transformation has animations    
+
+			//check if transformation has animations
 			if (animlist_map.find(listid) == animlist_map.end()) continue ; 
 			else 
 			{
@@ -840,25 +840,25 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node ,
 				const COLLADAFW::AnimationList *animlist = animlist_map[listid];
 				const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
 				//all the curves belonging to the current binding
-				std::vector<FCurve*> animcurves;    
+				std::vector<FCurve*> animcurves;
 				for (unsigned int j = 0; j < bindings.getCount(); j++) {
-					 animcurves = curve_map[bindings[j].animation];
-					 if ( is_matrix )
-						 apply_matrix_curves(ob, animcurves, root , node,  transform  );
-					 else {				
+					animcurves = curve_map[bindings[j].animation];
+					if ( is_matrix )
+						apply_matrix_curves(ob, animcurves, root , node,  transform  );
+					else {				
 						//calculate rnapaths and array index of fcurves according to transformation and animation class
-						 Assign_transform_animations(transform, &bindings[j], &animcurves, is_joint, joint_path ); 
-						
-						 std::vector<FCurve*>::iterator iter;
-							//Add the curves of the current animation to the object
-							for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
-								FCurve * fcu = *iter;
-								if ((ob->type == OB_ARMATURE))
-									add_bone_fcurve( ob, node , fcu );
-								else 
-									BLI_addtail(AnimCurves, fcu);	
-							}
+						Assign_transform_animations(transform, &bindings[j], &animcurves, is_joint, joint_path ); 
+
+						std::vector<FCurve*>::iterator iter;
+						//Add the curves of the current animation to the object
+						for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
+							FCurve * fcu = *iter;
+							if ((ob->type == OB_ARMATURE))
+								add_bone_fcurve( ob, node , fcu );
+							else 
+								BLI_addtail(AnimCurves, fcu);	
 						}
+					}
 				}
 			}
 			if (is_rotation) {
@@ -880,7 +880,7 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node ,
 		Lamp * lamp  = (Lamp*) ob->data;
 
 		if (!lamp->adt || !lamp->adt->action) act = verify_adt_action((ID*)&lamp->id, 1);
-					else act = lamp->adt->action;
+		else act = lamp->adt->action;
 
 		ListBase *AnimCurves = &(act->curves);
 		const COLLADAFW::InstanceLightPointerArray& nodeLights = node->getInstanceLights();
@@ -892,23 +892,23 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node ,
 			{
 				const COLLADAFW::Color *col =  &(light->getColor());
 				const COLLADAFW::UniqueId& listid = col->getAnimationList();
-				
+
 				Assign_color_animations(listid, AnimCurves, "color"); 
 			}
 			if ((animType->light & LIGHT_FOA) != 0 )
 			{
 				const COLLADAFW::AnimatableFloat *foa =  &(light->getFallOffAngle());
 				const COLLADAFW::UniqueId& listid = foa->getAnimationList();
-				
+
 				Assign_float_animations( listid ,AnimCurves, "spot_size"); 
 			}
 			if ( (animType->light & LIGHT_FOE) != 0 )
 			{
 				const COLLADAFW::AnimatableFloat *foe =  &(light->getFallOffExponent());
 				const COLLADAFW::UniqueId& listid = foe->getAnimationList();
-				
+
 				Assign_float_animations( listid ,AnimCurves, "spot_blend"); 
-			
+
 			}
 		}
 	}
@@ -918,7 +918,7 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node ,
 		Camera * camera  = (Camera*) ob->data;
 
 		if (!camera->adt || !camera->adt->action) act = verify_adt_action((ID*)&camera->id, 1);
-					else act = camera->adt->action;
+		else act = camera->adt->action;
 
 		ListBase *AnimCurves = &(act->curves);
 		const COLLADAFW::InstanceCameraPointerArray& nodeCameras= node->getInstanceCameras();
@@ -957,12 +957,12 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node ,
 		}
 	}
 	if ( animType->material != 0){
-		 Material *ma = give_current_material(ob, 1);
-		 if (!ma->adt || !ma->adt->action) act = verify_adt_action((ID*)&ma->id, 1);
-				else act = ma->adt->action;
+		Material *ma = give_current_material(ob, 1);
+		if (!ma->adt || !ma->adt->action) act = verify_adt_action((ID*)&ma->id, 1);
+		else act = ma->adt->action;
 
 		ListBase *AnimCurves = &(act->curves);
-		
+
 		const COLLADAFW::InstanceGeometryPointerArray& nodeGeoms = node->getInstanceGeometries();
 		for (unsigned int i = 0; i < nodeGeoms.getCount(); i++) {
 			const COLLADAFW::MaterialBindingArray& matBinds = nodeGeoms[i]->getMaterialBindings();
@@ -988,7 +988,7 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node ,
 					const COLLADAFW::UniqueId& listid =  cot->getColor().getAnimationList();
 					Assign_color_animations( listid, AnimCurves , "specular_color" );
 				}
-				
+
 				if((animType->material & MATERIAL_DIFF_COLOR) != 0){
 					const COLLADAFW::ColorOrTexture *cot = &(efc->getDiffuse());
 					const COLLADAFW::UniqueId& listid =  cot->getColor().getAnimationList();
@@ -1005,15 +1005,15 @@ AnimationImporter::AnimMix* AnimationImporter::get_animation_type ( const COLLAD
 											std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map) 
 {
 	AnimMix *types = new AnimMix();
-	
+
 	const COLLADAFW::TransformationPointerArray& nodeTransforms = node->getTransformations();
-	
+
 	//for each transformation in node 
 	for (unsigned int i = 0; i < nodeTransforms.getCount(); i++) {
 		COLLADAFW::Transformation *transform = nodeTransforms[i];
 		const COLLADAFW::UniqueId& listid = transform->getAnimationList();
-		
-		//check if transformation has animations    
+
+		//check if transformation has animations
 		if (animlist_map.find(listid) == animlist_map.end()) continue ;
 		else 
 		{
@@ -1028,9 +1028,9 @@ AnimationImporter::AnimMix* AnimationImporter::get_animation_type ( const COLLAD
 		types->light = setAnimType(&(light->getColor()),(types->light), LIGHT_COLOR);
 		types->light = setAnimType(&(light->getFallOffAngle()),(types->light), LIGHT_FOA);
 		types->light = setAnimType(&(light->getFallOffExponent()),(types->light), LIGHT_FOE);
-		
+
 		if ( types->light != 0) break;
-		
+
 	}
 
 	const COLLADAFW::InstanceCameraPointerArray& nodeCameras = node->getInstanceCameras();
@@ -1039,9 +1039,9 @@ AnimationImporter::AnimMix* AnimationImporter::get_animation_type ( const COLLAD
 
 		if ( camera->getCameraType() == COLLADAFW::Camera::PERSPECTIVE )
 		{
-		    types->camera = setAnimType(&(camera->getXMag()),(types->camera), CAMERA_XFOV);
+			types->camera = setAnimType(&(camera->getXMag()),(types->camera), CAMERA_XFOV);
 		}
-		else 
+		else
 		{
 			types->camera = setAnimType(&(camera->getXMag()),(types->camera), CAMERA_XMAG);
 		}
@@ -1063,7 +1063,7 @@ AnimationImporter::AnimMix* AnimationImporter::get_animation_type ( const COLLAD
 			types->material =  setAnimType(&(efc->getShininess()),(types->material), MATERIAL_SHININESS);
 			types->material =  setAnimType(&(efc->getSpecular().getColor()),(types->material), MATERIAL_SPEC_COLOR);
 			types->material =  setAnimType(&(efc->getDiffuse().getColor()),(types->material), MATERIAL_DIFF_COLOR);
-		   // types->material =  setAnimType(&(efc->get()),(types->material), MATERIAL_TRANSPARENCY);
+			// types->material =  setAnimType(&(efc->get()),(types->material), MATERIAL_TRANSPARENCY);
 			types->material =  setAnimType(&(efc->getIndexOfRefraction()),(types->material), MATERIAL_IOR);
 		}
 	}
@@ -1101,7 +1101,7 @@ void AnimationImporter::find_frames_old(std::vector<float> * frames, COLLADAFW::
 				
 				const COLLADAFW::AnimationList *animlist = animlist_map[listid];
 				const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
-                
+
 				if (bindings.getCount()) {
 					//for each AnimationBinding get the fcurves which animate the transform
 					for (unsigned int j = 0; j < bindings.getCount(); j++) {
@@ -1113,7 +1113,7 @@ void AnimationImporter::find_frames_old(std::vector<float> * frames, COLLADAFW::
 
 							for (iter = curves.begin(); iter != curves.end(); iter++) {
 								FCurve *fcu = *iter;
-                                
+
 								//if transform is rotation the fcurves values must be turned in to radian.
 								if (is_rotation)
 									fcurve_deg_to_rad(fcu);
@@ -1448,9 +1448,9 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
 	COLLADAFW::Transformation::TransformationType type = tm->getTransformationType();
 
 	if (type != COLLADAFW::Transformation::ROTATE &&
-	    type != COLLADAFW::Transformation::SCALE &&
-	    type != COLLADAFW::Transformation::TRANSLATE &&
-	    type != COLLADAFW::Transformation::MATRIX) {
+		type != COLLADAFW::Transformation::SCALE &&
+		type != COLLADAFW::Transformation::TRANSLATE &&
+		type != COLLADAFW::Transformation::MATRIX) {
 		fprintf(stderr, "animation of transformation %d is not supported yet\n", type);
 		return false;
 	}
@@ -1572,7 +1572,7 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
 
 				COLLADAFW::Matrix tm(matrix);
 				dae_matrix_to_mat4(&tm, mat);
-                
+
 				std::vector<FCurve*>::iterator it;
 
 				return true;
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h
index 18303eb2f0b..ed9a2171c87 100644
--- a/source/blender/collada/AnimationImporter.h
+++ b/source/blender/collada/AnimationImporter.h
@@ -88,7 +88,7 @@ private:
 	void add_fcurves_to_object(Object *ob, std::vector<FCurve*>& curves, char *rna_path, int array_index, Animation *animated);
 	
 	int typeFlag;
-    
+
 	enum lightAnim
 	{
 //		INANIMATE = 0,
@@ -144,7 +144,7 @@ public:
 #if 0
 	virtual void change_eul_to_quat(Object *ob, bAction *act);
 #endif
-  
+
 	void translate_Animations( COLLADAFW::Node * Node , 
 												   std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map,
 												   std::map<COLLADAFW::UniqueId, Object*>& object_map ,
@@ -161,7 +161,7 @@ public:
 
 	void Assign_color_animations(const COLLADAFW::UniqueId& listid, ListBase *AnimCurves ,char * anim_type);
 	void Assign_float_animations(const COLLADAFW::UniqueId& listid, ListBase *AnimCurves, char * anim_type);
-    
+
 	int setAnimType ( const COLLADAFW::Animatable * prop , int type, int addition);
 	
 	void modify_fcurve(std::vector<FCurve*>* curves , char* rna_path , int array_index );
@@ -206,5 +206,5 @@ public:
 
 	void extra_data_importer(std::string elementName);
 };
- 
- #endif
+
+#endif
diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp
index 92d06bb639f..de01c000373 100644
--- a/source/blender/collada/ArmatureExporter.cpp
+++ b/source/blender/collada/ArmatureExporter.cpp
@@ -188,7 +188,7 @@ void ArmatureExporter::add_bone_node(Bone *bone, Object *ob_arm)
 	for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next) {
 		add_bone_node(child, ob_arm);
 	}
-    node.end();
+	node.end();
 	//}
 }
 
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index 2ec8ae540d2..27aee133557 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -87,7 +87,7 @@ void ArmatureImporter::create_unskinned_bone( COLLADAFW::Node *node, EditBone *p
 	if ( it != finished_joints.end()) return; 
 
 	float mat[4][4];
-    float obmat[4][4];
+	float obmat[4][4];
 
 	// object-space
 	get_node_mat(obmat, node, NULL, NULL);
@@ -296,7 +296,7 @@ void ArmatureImporter::add_leaf_bone(float mat[][4], EditBone *bone,  COLLADAFW:
 		et->setData("tip_z",&z);
 		float vec[3] = {x,y,z};
 		copy_v3_v3(leaf.bone->tail, leaf.bone->head);
-	    add_v3_v3v3(leaf.bone->tail, leaf.bone->head, vec);
+		add_v3_v3v3(leaf.bone->tail, leaf.bone->head, vec);
 	}else
 		leaf_bones.push_back(leaf);
 }
diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h
index 4f4aed210f2..a197e612a87 100644
--- a/source/blender/collada/ArmatureImporter.h
+++ b/source/blender/collada/ArmatureImporter.h
@@ -115,7 +115,7 @@ private:
 
 	void fix_leaf_bones();
 	
-    void set_pose ( Object * ob_arm ,  COLLADAFW::Node * root_node ,char * parentname, float parent_mat[][4]);
+	void set_pose ( Object * ob_arm ,  COLLADAFW::Node * root_node ,char * parentname, float parent_mat[][4]);
 
 
 #if 0
@@ -171,7 +171,7 @@ public:
 	
 	// gives a world-space mat
 	bool get_joint_bind_mat(float m[][4], COLLADAFW::Node *joint);
-    
+
 	void set_tags_map( TagsMap& tags_map);
 	
 };
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index 760fb2359a4..6032109b809 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -411,7 +411,7 @@ int MeshImporter::count_new_tris(COLLADAFW::Mesh *mesh, Mesh *me)
 }
 
 // TODO: import uv set names
-void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris)        //TODO:: Refactor. Possibly replace by iterators
+void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //TODO:: Refactor. Possibly replace by iterators
 {
 	unsigned int i;
 	
diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp
index ce0d561c524..1d890415ebe 100644
--- a/source/blender/collada/SkinInfo.cpp
+++ b/source/blender/collada/SkinInfo.cpp
@@ -266,9 +266,9 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique
 	// ^ bone index can be -1 meaning weight toward bind shape, how to express this in Blender?
 
 	// for each vertex in weight indices
-	//   for each bone index in vertex
-	//     add vertex to group at group index
-	//     treat group index -1 specially
+	//	for each bone index in vertex
+	//		add vertex to group at group index
+	//		treat group index -1 specially
 
 	// get def group by index with BLI_findlink
 
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp
index 7bad9bdeba7..88ed112c3fe 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/collada/TransformWriter.cpp
@@ -50,7 +50,7 @@ void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[][4],
 
 	double dmat[4][4];
 	UnitConverter* converter = new UnitConverter();
-    converter->mat4_to_dae_double(dmat,local);
+	converter->mat4_to_dae_double(dmat,local);
 
 	TransformBase::decompose(local, loc, rot, NULL, scale);
 	if ( node.getType() == COLLADASW::Node::JOINT)
-- 
cgit v1.2.3


From cbc812b757068c65effd90bdd4b08d7f4e25c342 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Sun, 4 Sep 2011 01:13:44 +0000
Subject: Fix [#28322] COLLADA imports messed up UVs Reported by Chad Gleason

Imported index order could put mface->v4==0. We already know amount of verts, so use that instead.
---
 source/blender/collada/MeshImporter.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index 6032109b809..e9086f05628 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -220,8 +220,8 @@ void MeshImporter::set_face_uv(MTFace *mtface, UVDataWrapper &uvs,
 
 	if (quad) uvs.getUV(indices[index + 3], mtface->uv[3]);
 
-#ifdef COLLADA_DEBUG
-	/*if (quad) {
+#if 1 // #ifdef COLLADA_DEBUG
+	if (quad) {
 		fprintf(stderr, "face uv:\n"
 				"((%d, %d, %d, %d))\n"
 				"((%.1f, %.1f), (%.1f, %.1f), (%.1f, %.1f), (%.1f, %.1f))\n",
@@ -248,7 +248,7 @@ void MeshImporter::set_face_uv(MTFace *mtface, UVDataWrapper &uvs,
 				mtface->uv[0][0], mtface->uv[0][1],
 				mtface->uv[1][0], mtface->uv[1][1],
 				mtface->uv[2][0], mtface->uv[2][1]);
-	}*/
+	}
 #endif
 }
 
@@ -587,7 +587,7 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
 					for (k = 0; k < index_list_array.getCount(); k++) {
 						// get mtface by face index and uv set index
 						MTFace *mtface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, k);
-						set_face_uv(&mtface[face_index], uvs, *index_list_array[k], index, mface->v4 != 0);
+						set_face_uv(&mtface[face_index], uvs, *index_list_array[k], index, vcount == 4);
 					}
 #endif
 
-- 
cgit v1.2.3