[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49245] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49241:49244
Campbell Barton
ideasman42 at gmail.com
Thu Jul 26 12:55:07 CEST 2012
Revision: 49245
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49245
Author: campbellbarton
Date: 2012-07-26 10:55:07 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49241:49244
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49241
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49241
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49244
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2012-07-26 10:53:59 UTC (rev 49244)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2012-07-26 10:55:07 UTC (rev 49245)
@@ -42,7 +42,7 @@
* 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
Modified: branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h 2012-07-26 10:53:59 UTC (rev 49244)
+++ branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h 2012-07-26 10:55:07 UTC (rev 49245)
@@ -127,6 +127,7 @@
TH_BONE_SOLID,
TH_BONE_POSE,
+ TH_BONE_POSE_ACTIVE,
TH_STRIP,
TH_STRIP_SELECT,
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49241
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49244
Modified: branches/soc-2011-tomato/source/blender/editors/interface/resources.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/resources.c 2012-07-26 10:53:59 UTC (rev 49244)
+++ branches/soc-2011-tomato/source/blender/editors/interface/resources.c 2012-07-26 10:55:07 UTC (rev 49245)
@@ -303,6 +303,8 @@
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 @@
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 @@
}
}
+ 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;
Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49241
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49244
Modified: branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c 2012-07-26 10:53:59 UTC (rev 49244)
+++ branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c 2012-07-26 10:55:07 UTC (rev 49245)
@@ -171,7 +171,7 @@
}
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 */
Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c 2012-07-26 10:53:59 UTC (rev 49244)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c 2012-07-26 10:55:07 UTC (rev 49245)
@@ -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 @@
}
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);
Modified: branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c 2012-07-26 10:53:59 UTC (rev 49244)
+++ branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c 2012-07-26 10:55:07 UTC (rev 49245)
@@ -3380,14 +3380,11 @@
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);
Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h 2012-07-26 10:53:59 UTC (rev 49244)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h 2012-07-26 10:55:07 UTC (rev 49245)
@@ -215,7 +215,7 @@
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 @@
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 */
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c 2012-07-26 10:53:59 UTC (rev 49244)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c 2012-07-26 10:55:07 UTC (rev 49245)
@@ -2045,7 +2045,7 @@
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);
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c 2012-07-26 10:53:59 UTC (rev 49244)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list