[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49300] branches/soc-2011-tomato: Merging r49287 through r49299 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Fri Jul 27 17:12:59 CEST 2012
Revision: 49300
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49300
Author: nazgul
Date: 2012-07-27 15:12:58 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
Merging r49287 through r49299 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49287
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49299
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
branches/soc-2011-tomato/source/blender/imbuf/intern/divers.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-49286
+ /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-49299
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2012-07-27 14:53:57 UTC (rev 49299)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2012-07-27 15:12:58 UTC (rev 49300)
@@ -5643,6 +5643,7 @@
* so assume that here we're doing for undo only...
*/
sima->gpd = restore_pointer_by_name(newmain, (ID *)sima->gpd, 1);
+ sima->mask_info.mask = restore_pointer_by_name(newmain, (ID *)sima->mask_info.mask, 1);
}
else if (sl->spacetype == SPACE_SEQ) {
SpaceSeq *sseq = (SpaceSeq *)sl;
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-49286
+ /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-49299
Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c 2012-07-27 14:53:57 UTC (rev 49299)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c 2012-07-27 15:12:58 UTC (rev 49300)
@@ -497,8 +497,6 @@
WM_keymap_add_item(keymap, "MASK_OT_normals_make_consistent", NKEY, KM_PRESS, KM_CTRL, 0);
// WM_keymap_add_item(keymap, "MASK_OT_feather_weight_clear", SKEY, KM_PRESS, KM_ALT, 0);
/* ... matches curve editmode */
- RNA_enum_set(WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", SKEY, KM_PRESS, KM_ALT, 0)->ptr,
- "mode", TFM_MASK_SHRINKFATTEN);
/* relationships */
WM_keymap_add_item(keymap, "MASK_OT_parent_set", PKEY, KM_PRESS, KM_CTRL, 0);
@@ -510,7 +508,13 @@
/* for image editor only */
WM_keymap_add_item(keymap, "UV_OT_cursor_set", ACTIONMOUSE, KM_PRESS, 0, 0);
- transform_keymap_for_space(keyconf, keymap, SPACE_CLIP);
+ /* Transform (don't use transform_keymap_for_space() since this maps to different spaces) */
+ WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", GKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", EVT_TWEAK_S, KM_ANY, 0, 0);
+ WM_keymap_add_item(keymap, "TRANSFORM_OT_resize", SKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "TRANSFORM_OT_rotate", RKEY, KM_PRESS, 0, 0);
+ kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", SKEY, KM_PRESS, KM_ALT, 0);
+ RNA_enum_set(kmi->ptr, "mode", TFM_MASK_SHRINKFATTEN);
}
void ED_operatormacros_mask(void)
Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c 2012-07-27 14:53:57 UTC (rev 49299)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c 2012-07-27 15:12:58 UTC (rev 49300)
@@ -548,7 +548,6 @@
return OPERATOR_PASS_THROUGH;
}
-/* MASKTODO - image space */
void MASK_OT_select_lasso(wmOperatorType *ot)
{
/* identifiers */
Modified: branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c 2012-07-27 14:53:57 UTC (rev 49299)
+++ branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c 2012-07-27 15:12:58 UTC (rev 49300)
@@ -4646,6 +4646,7 @@
return OPERATOR_RUNNING_MODAL;
}
}
+
switch (event->type) {
case ESCKEY:
case RIGHTMOUSE:
@@ -4678,7 +4679,7 @@
edbm_bevel_calc(C, op);
edbm_bevel_update_header(op, C);
}
- return OPERATOR_RUNNING_MODAL;
+ break;
case LEFTMOUSE:
case PADENTER:
@@ -4695,7 +4696,7 @@
edbm_bevel_calc(C, op);
edbm_bevel_update_header(op, C);
}
- return OPERATOR_RUNNING_MODAL;
+ break;
case DKEY:
if (event->val == KM_PRESS) {
@@ -4705,7 +4706,7 @@
edbm_bevel_calc(C, op);
edbm_bevel_update_header(op, C);
}
- return OPERATOR_RUNNING_MODAL;
+ break;
}
return OPERATOR_RUNNING_MODAL;
@@ -4785,7 +4786,12 @@
{
InsetData *opdata = op->customdata;
- static char str[] = "Confirm: Enter/LClick, Cancel: (Esc/RClick), thickness: %s, depth (Ctrl to tweak): %s (%s), Outset (O): (%s)";
+ static const char str[] = "Confirm: Enter/LClick, "
+ "Cancel: (Esc/RClick), "
+ "thickness: %s, "
+ "depth (Ctrl to tweak): %s (%s), "
+ "Outset (O): (%s), "
+ "Boundary (B): (%s)";
char msg[HEADER_LENGTH];
ScrArea *sa = CTX_wm_area(C);
@@ -4802,7 +4808,8 @@
flts_str,
flts_str + NUM_STR_REP_LEN,
opdata->modify_depth ? "On" : "Off",
- RNA_boolean_get(op->ptr, "use_outset") ? "On" : "Off"
+ RNA_boolean_get(op->ptr, "use_outset") ? "On" : "Off",
+ RNA_boolean_get(op->ptr, "use_boundary") ? "On" : "Off"
);
ED_area_headerprint(sa, msg);
@@ -4982,6 +4989,7 @@
}
}
}
+
switch (event->type) {
case ESCKEY:
case RIGHTMOUSE:
@@ -5019,7 +5027,7 @@
return OPERATOR_CANCELLED;
}
}
- return OPERATOR_RUNNING_MODAL;
+ break;
case LEFTMOUSE:
case PADENTER:
@@ -5041,7 +5049,7 @@
opdata->shift_amount = 0.0f;
opdata->shift = FALSE;
}
- return OPERATOR_RUNNING_MODAL;
+ break;
case LEFTCTRLKEY:
case RIGHTCTRLKEY:
@@ -5066,7 +5074,7 @@
opdata->initial_length = len_v2(mlen);
edbm_inset_update_header(op, C);
- return OPERATOR_RUNNING_MODAL;
+ break;
}
case OKEY:
@@ -5075,13 +5083,26 @@
RNA_boolean_set(op->ptr, "use_outset", !use_outset);
if (edbm_inset_calc(C, op)) {
edbm_inset_update_header(op, C);
- return OPERATOR_RUNNING_MODAL;
}
else {
edbm_inset_cancel(C, op);
return OPERATOR_CANCELLED;
}
}
+ break;
+ case BKEY:
+ if (event->val == KM_PRESS) {
+ int use_boundary = RNA_boolean_get(op->ptr, "use_boundary");
+ RNA_boolean_set(op->ptr, "use_boundary", !use_boundary);
+ if (edbm_inset_calc(C, op)) {
+ edbm_inset_update_header(op, C);
+ }
+ else {
+ edbm_inset_cancel(C, op);
+ return OPERATOR_CANCELLED;
+ }
+ }
+ break;
}
return OPERATOR_RUNNING_MODAL;
Modified: branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c 2012-07-27 14:53:57 UTC (rev 49299)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c 2012-07-27 15:12:58 UTC (rev 49300)
@@ -4311,7 +4311,7 @@
ima = BKE_image_load_exists(path);
if (!ima) {
- BKE_reportf(op->reports, RPT_ERROR, "Can't read: \"%s\", %s", path, errno ? strerror(errno) : "Unsupported image format");
+ BKE_reportf(op->reports, RPT_ERROR, "Can't read image: \"%s\", %s", path, errno ? strerror(errno) : "Unsupported format");
return OPERATOR_CANCELLED;
}
}
@@ -4352,6 +4352,7 @@
}
node->id = (ID *)ima;
+ id_us_plus(node->id);
snode_notify(C, snode);
snode_dag_update(C, snode);
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-49286
+ /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-49299
Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c 2012-07-27 14:53:57 UTC (rev 49299)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c 2012-07-27 15:12:58 UTC (rev 49300)
@@ -574,6 +574,8 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list