* Multiply for panorama cameras

* Some cases of struct name being set where it shouldnt have been.
* Spelling: wich --> which
* Copy and initialize uv modifier scale, remove unneeded enum.
* Ability to pin any object into the context.
* Update uv window while transforming (useful when used with UVProject modifier)
* Patch by Wahooney, so new template's are internal text and dont get saved over
  by mistake.
* Fix for https://bugzilla.redhat.com/show_bug.cgi?id=572186
  Bug 572186 - [abrt] crash in blender-2.49b-5.fc12: Process
  /usr/bin/blender.bin was killed by signal 6 (SIGABRT). Original fix submitted
  by Jochen Schmitt.
* [#21816] bpy.data.add_image has stopped working on Windows. moved to
  bpy.data.images.load(), missed this call.

(commits 27726,27825,27828,27831,27832,27833,27834,27836,27837,27838,27839,27858 by Campbell from render25 branch)

2 files changed, 24 insertions, 13 deletions

diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index e1df3b9f18f..961c3cf17ce 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -816,21 +816,9 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 static void pin_cb(bContext *C, void *arg1, void *arg2)
 {
 	SpaceButs *sbuts= CTX_wm_space_buts(C);
-	ButsContextPath *path= sbuts->path;
-	PointerRNA *ptr;
-	int a;
 
 	if(sbuts->flag & SB_PIN_CONTEXT) {
-		if(path->len) {
-			for(a=path->len-1; a>=0; a--) {
-				ptr= &path->ptr[a];
-
-				if(ptr->id.data) {
-					sbuts->pinid= ptr->id.data;
-					break;
-				}
-			}
-		}
+		sbuts->pinid= buttons_context_id_path(C);
 	}
 	else
 		sbuts->pinid= NULL;
@@ -901,3 +889,24 @@ void buttons_context_register(ARegionType *art)
 	pt->flag= PNL_NO_HEADER;
 	BLI_addtail(&art->paneltypes, pt);
 }
+
+ID *buttons_context_id_path(const bContext *C)
+{
+	SpaceButs *sbuts= CTX_wm_space_buts(C);
+	ButsContextPath *path= sbuts->path;
+	PointerRNA *ptr;
+	int a;
+
+	if(path->len) {
+		for(a=path->len-1; a>=0; a--) {
+			ptr= &path->ptr[a];
+
+			if(ptr->id.data) {
+				return ptr->id.data;
+				break;
+			}
+		}
+	}
+
+	return NULL;
+}
diff --git a/source/blender/editors/space_buttons/buttons_intern.h b/source/blender/editors/space_buttons/buttons_intern.h
index f28d77159a5..9478168f35a 100644
--- a/source/blender/editors/space_buttons/buttons_intern.h
+++ b/source/blender/editors/space_buttons/buttons_intern.h
@@ -35,6 +35,7 @@ struct bContextDataResult;
 struct SpaceButs;
 struct uiLayout;
 struct wmOperatorType;
+struct ID;
 
 /* buts->scaflag */		
 #define BUTS_SENS_SEL		1
@@ -62,6 +63,7 @@ void buttons_context_compute(const struct bContext *C, struct SpaceButs *sbuts);
 int buttons_context(const struct bContext *C, const char *member, struct bContextDataResult *result);
 void buttons_context_draw(const struct bContext *C, struct uiLayout *layout);
 void buttons_context_register(struct ARegionType *art);
+struct ID *buttons_context_id_path(const struct bContext *C);
 
 /* buttons_ops.c */
 void BUTTONS_OT_file_browse(struct wmOperatorType *ot);