Revision: 48308
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48308
Author: campbellbarton
Date: 2012-06-26 10:17:11 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48305:48307
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48305
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MathNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_draw.c
branches/soc-2011-tomato/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-tomato/source/blender/editors/space_action/action_select.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-48305
+
/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-48307
Modified:
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MathNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MathNode.cpp
2012-06-26 10:14:50 UTC (rev 48307)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MathNode.cpp
2012-06-26 10:17:11 UTC (rev 48308)
@@ -28,8 +28,7 @@
{
MathBaseOperation *operation = NULL;
- switch (this->getbNode()->custom1)
- {
+ switch (this->getbNode()->custom1) {
case 0: /* Add */
operation = new MathAddOperation();
break;
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
2012-06-26 10:14:50 UTC (rev 48307)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
2012-06-26 10:17:11 UTC (rev 48308)
@@ -36,8 +36,7 @@
void ConvertRGBToYCCOperation::setMode(int mode)
{
- switch (mode)
- {
+ switch (mode) {
case 1:
this->m_mode = BLI_YCC_ITU_BT709;
break;
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
2012-06-26 10:14:50 UTC (rev 48307)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
2012-06-26 10:17:11 UTC (rev 48308)
@@ -36,8 +36,7 @@
void ConvertYCCToRGBOperation::setMode(int mode)
{
- switch (mode)
- {
+ switch (mode) {
case 1:
this->m_mode = BLI_YCC_ITU_BT709;
break;
Modified:
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
2012-06-26 10:14:50 UTC (rev 48307)
+++ branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
2012-06-26 10:17:11 UTC (rev 48308)
@@ -2397,13 +2397,15 @@
case ANIMCONT_GPENCIL:
{
- items = animdata_filter_gpencil(anim_data,
data, filter_mode);
+ if (animdata_filter_dopesheet_summary(ac,
anim_data, filter_mode, &items))
+ items =
animdata_filter_gpencil(anim_data, data, filter_mode);
}
break;
case ANIMCONT_MASK:
{
- items = animdata_filter_mask(anim_data, data,
filter_mode);
+ if (animdata_filter_dopesheet_summary(ac,
anim_data, filter_mode, &items))
+ items = animdata_filter_mask(anim_data,
data, filter_mode);
}
break;
Modified:
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/animation/keyframes_draw.c
2012-06-26 10:14:50 UTC (rev 48307)
+++ branches/soc-2011-tomato/source/blender/editors/animation/keyframes_draw.c
2012-06-26 10:17:11 UTC (rev 48308)
@@ -847,9 +847,17 @@
ANIM_animdata_filter(ac, &anim_data, filter, ac->data,
ac->datatype);
/* loop through each F-Curve, grabbing the keyframes */
- for (ale = anim_data.first; ale; ale = ale->next)
+ for (ale = anim_data.first; ale; ale = ale->next) {
fcurve_to_keylist(ale->adt, ale->data, keys, blocks);
-
+
+ if (ale->datatype == ALE_MASKLAY) {
+ mask_to_keylist(ac->ads, ale->data, keys);
+ }
+ else if (ale->datatype == ALE_GPFRAME) {
+ gpl_to_keylist(ac->ads, ale->data, keys);
+ }
+ }
+
BLI_freelistN(&anim_data);
}
}
Modified: branches/soc-2011-tomato/source/blender/editors/include/ED_anim_api.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/ED_anim_api.h
2012-06-26 10:14:50 UTC (rev 48307)
+++ branches/soc-2011-tomato/source/blender/editors/include/ED_anim_api.h
2012-06-26 10:17:11 UTC (rev 48308)
@@ -177,7 +177,7 @@
ALE_NONE = 0, /* no keyframe data */
ALE_FCURVE, /* F-Curve */
ALE_GPFRAME, /* Grease Pencil Frames */
- ALE_MASKLAY, /* Mask */
+ ALE_MASKLAY, /* Mask */
ALE_NLASTRIP, /* NLA Strips */
ALE_ALL, /* All channels summary */
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-48305
+ /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-48307
Modified:
branches/soc-2011-tomato/source/blender/editors/space_action/action_select.c
===================================================================
---
branches/soc-2011-tomato/source/blender/editors/space_action/action_select.c
2012-06-26 10:14:50 UTC (rev 48307)
+++
branches/soc-2011-tomato/source/blender/editors/space_action/action_select.c
2012-06-26 10:17:11 UTC (rev 48308)
@@ -930,8 +930,25 @@
ED_gpencil_select_frame(ale->data, selx, select_mode);
else if (ale->type == ANIMTYPE_MASKLAYER)
ED_mask_select_frame(ale->data, selx, select_mode);
- else
- ANIM_animchannel_keyframes_loop(&ked, ac->ads, ale, ok_cb,
select_cb, NULL);
+ else {
+ if (ELEM(ac->datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK) &&
+ (ale->type == ANIMTYPE_SUMMARY) && (ale->datatype ==
ALE_ALL))
+ {
+ ListBase anim_data = {NULL, NULL};
+ int filter;
+ filter = (ANIMFILTER_DATA_VISIBLE |
ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY */ | ANIMFILTER_NODUPLIS);
+ ANIM_animdata_filter(ac, &anim_data, filter, ac->data,
ac->datatype);
+ for (ale = anim_data.first; ale; ale = ale->next) {
+ if (ale->type == ANIMTYPE_GPLAYER)
+ ED_gpencil_select_frame(ale->data,
selx, select_mode);
+ else if (ale->type == ANIMTYPE_MASKLAYER)
+ ED_mask_select_frame(ale->data, selx,
select_mode);
+ }
+ }
+ else {
+ ANIM_animchannel_keyframes_loop(&ked, ac->ads, ale,
ok_cb, select_cb, NULL);
+ }
+ }
}
/* Option 2) Selects all the keyframes on either side of the current frame
(depends on which side the mouse is on) */
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-48305
+
/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-48307
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
