svn merge ^/trunk/blender -r49241:49244

source/blender/blenkernel/BKE_blender.h

@@ -42,7 +42,7 @@ extern "C" {
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         263
-#define BLENDER_SUBVERSION      14
+#define BLENDER_SUBVERSION      15
 
 #define BLENDER_MINVERSION      250
 #define BLENDER_MINSUBVERSION   0

source/blender/editors/include/UI_resources.h

@@ -127,6 +127,7 @@ enum {
 	
 	TH_BONE_SOLID,
 	TH_BONE_POSE,
+	TH_BONE_POSE_ACTIVE,
 	
 	TH_STRIP,
 	TH_STRIP_SELECT,

source/blender/editors/interface/resources.c

@@ -303,6 +303,8 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 					cp = ts->bone_solid; break;
 				case TH_BONE_POSE:
 					cp = ts->bone_pose; break;
+				case TH_BONE_POSE_ACTIVE:
+					cp = ts->bone_pose_active; break;
 				case TH_STRIP:
 					cp = ts->strip; break;
 				case TH_STRIP_SELECT:
@@ -739,6 +741,7 @@ void ui_theme_init_default(void)
 	rgba_char_args_set(btheme->tv3d.bone_solid, 200, 200, 200, 255);
 	/* alpha 80 is not meant editable, used for wire+action draw */
 	rgba_char_args_set(btheme->tv3d.bone_pose, 80, 200, 255, 80);
+	rgba_char_args_set(btheme->tv3d.bone_pose_active, 140, 255, 255, 80);
 
 	rgba_char_args_set(btheme->tv3d.bundle_solid, 200, 200, 200, 255);
 	rgba_char_args_set(btheme->tv3d.camera_path, 0x00, 0x00, 0x00, 255);
@@ -1914,6 +1917,13 @@ void init_userdef_do_versions(void)
 		}
 	}
 
+	if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 15)) {
+		bTheme *btheme;
+		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+			rgba_char_args_set(btheme->tv3d.bone_pose_active, 140, 255, 255, 80);
+		}
+	}
+
 	/* GL Texture Garbage Collection (variable abused above!) */
 	if (U.textimeout == 0) {
 		U.texcollectrate = 60;

source/blender/editors/space_view3d/drawarmature.c

@@ -171,7 +171,7 @@ static short set_pchan_glColor(short colCode, int boneflag, short constflag)
 			}
 			else {
 				if ((boneflag & BONE_DRAW_ACTIVE) && (boneflag & BONE_SELECTED)) {
-					UI_ThemeColorShade(TH_BONE_POSE, 40);
+					UI_ThemeColor(TH_BONE_POSE_ACTIVE);
 				}
 				else if (boneflag & BONE_DRAW_ACTIVE) {
 					UI_ThemeColorBlend(TH_WIRE, TH_BONE_POSE, 0.15f); /* unselected active */

source/blender/editors/transform/transform_generics.c

@@ -73,6 +73,7 @@
 #include "BKE_context.h"
 #include "BKE_tessmesh.h"
 #include "BKE_tracking.h"
+#include "BKE_mask.h"
 
 #include "ED_anim_api.h"
 #include "ED_armature.h"
@@ -1449,8 +1450,26 @@ void calculateCenterCursor2D(TransInfo *t)
 	}
 	
 	if (cursor) {
-		t->center[0] = cursor[0] * aspx;
-		t->center[1] = cursor[1] * aspy;
+		if (t->options & CTX_MASK) {
+			float co[2];
+			int width, height;
+			float frame_size[2];
+			SpaceImage *sima = (SpaceImage *)t->sa->spacedata.first;
+			ED_space_image_get_size(sima, &width, &height);
+			frame_size[0] = width;
+			frame_size[1] = height;
+
+			BKE_mask_coord_from_frame(co, cursor, frame_size);
+
+			ED_space_image_get_aspect(sima, &aspx, &aspy);
+
+			t->center[0] = co[0] * aspx;
+			t->center[1] = co[1] * aspy;
+		}
+		else {
+			t->center[0] = cursor[0] * aspx;
+			t->center[1] = cursor[1] * aspy;
+		}
 	}
 	
 	calculateCenter2D(t);

source/blender/editors/uvedit/uvedit_ops.c

@@ -3380,14 +3380,11 @@ static void UV_OT_reveal(wmOperatorType *ot)
 static int set_2d_cursor_exec(bContext *C, wmOperator *op)
 {
 	SpaceImage *sima = CTX_wm_space_image(C);
-	float location[2];
 
 	if (!sima)
 		return OPERATOR_CANCELLED;
 
-	RNA_float_get_array(op->ptr, "location", location);
-	sima->cursor[0] = location[0];
-	sima->cursor[1] = location[1];
+	RNA_float_get_array(op->ptr, "location", sima->cursor);
 	
 	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_IMAGE, NULL);
 	

source/blender/makesdna/DNA_userdef_types.h

@@ -215,7 +215,7 @@ typedef struct ThemeSpace {
 	char extra_edge_len[4], extra_face_angle[4], extra_face_area[4], pad3[4];
 	char normal[4];
 	char vertex_normal[4];
-	char bone_solid[4], bone_pose[4];
+	char bone_solid[4], bone_pose[4], bone_pose_active[4];
 	char strip[4], strip_select[4];
 	char cframe[4];
 	
@@ -264,8 +264,6 @@ typedef struct ThemeSpace {
 
 	char skin_root[4]; /* Skin modifier root color */
 	
-	int pad4;
-	
 	/* NLA */
 	char anim_active[4];	 /* Active Action + Summary Channel */
 	char anim_non_active[4]; /* Active Action = NULL */

source/blender/makesrna/intern/rna_space.c

@@ -2045,7 +2045,7 @@ static void rna_def_space_image(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "mode");
 	RNA_def_property_enum_items(prop, image_space_mode_items);
 	RNA_def_property_ui_text(prop, "Mode", "Editing context being displayed");
-	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, "rna_SpaceImageEditor_mode_update");
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, "rna_SpaceImageEditor_mode_update");
 
 	/* grease pencil */
 	prop = RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE);

source/blender/makesrna/intern/rna_userdef.c

@@ -1183,6 +1183,11 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Bone Pose", "");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
+	prop = RNA_def_property(srna, "bone_pose_active", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Bone Pose Active", "");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+
 	prop = RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_float_sdna(prop, NULL, "cframe");
 	RNA_def_property_array(prop, 3);