Revision: 21537
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21537
Author: gsrb3d
Date: 2009-07-12 00:22:53 +0200 (Sun, 12 Jul 2009)
Log Message:
-----------
SVN maintenance.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/fmodifier.c
branches/blender2.5/blender/source/blender/blenkernel/nla_private.h
branches/blender2.5/blender/source/blender/editors/space_graph/graph_utils.c
Property Changed:
----------------
branches/blender2.5/blender/source/blender/blenkernel/intern/fmodifier.c
branches/blender2.5/blender/source/blender/blenkernel/nla_private.h
branches/blender2.5/blender/source/blender/editors/animation/fmodifier_ui.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_utils.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_nla.c
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/fmodifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/fmodifier.c
2009-07-11 22:13:01 UTC (rev 21536)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/fmodifier.c
2009-07-11 22:22:53 UTC (rev 21537)
@@ -1,5 +1,5 @@
/**
- * $Id: fcurve.c 21299 2009-07-02 02:12:37Z aligorith $
+ * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
Property changes on:
branches/blender2.5/blender/source/blender/blenkernel/intern/fmodifier.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Modified: branches/blender2.5/blender/source/blender/blenkernel/nla_private.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/nla_private.h
2009-07-11 22:13:01 UTC (rev 21536)
+++ branches/blender2.5/blender/source/blender/blenkernel/nla_private.h
2009-07-11 22:22:53 UTC (rev 21537)
@@ -1,5 +1,5 @@
/**
- * $Id: BKE_nla.h 20999 2009-06-19 04:45:56Z aligorith $
+ * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
Property changes on:
branches/blender2.5/blender/source/blender/blenkernel/nla_private.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Property changes on:
branches/blender2.5/blender/source/blender/editors/animation/fmodifier_ui.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Modified:
branches/blender2.5/blender/source/blender/editors/space_graph/graph_utils.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_graph/graph_utils.c
2009-07-11 22:13:01 UTC (rev 21536)
+++
branches/blender2.5/blender/source/blender/editors/space_graph/graph_utils.c
2009-07-11 22:22:53 UTC (rev 21537)
@@ -1,288 +1,288 @@
-/**
- * $Id:
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2009 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation, Joshua Leung
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-#include <float.h>
-
-#include "DNA_anim_types.h"
-#include "DNA_action_types.h"
-#include "DNA_object_types.h"
-#include "DNA_space_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_userdef_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_arithb.h"
-#include "BLI_blenlib.h"
-#include "BLI_editVert.h"
-#include "BLI_rand.h"
-
-#include "BKE_animsys.h"
-#include "BKE_action.h"
-#include "BKE_context.h"
-#include "BKE_curve.h"
-#include "BKE_customdata.h"
-#include "BKE_depsgraph.h"
-#include "BKE_fcurve.h"
-#include "BKE_object.h"
-#include "BKE_global.h"
-#include "BKE_scene.h"
-#include "BKE_screen.h"
-#include "BKE_utildefines.h"
-
-#include "BIF_gl.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "RNA_access.h"
-#include "RNA_define.h"
-
-#include "ED_anim_api.h"
-#include "ED_keyframing.h"
-#include "ED_screen.h"
-#include "ED_types.h"
-#include "ED_util.h"
-
-#include "UI_interface.h"
-#include "UI_resources.h"
-#include "UI_view2d.h"
-
-#include "graph_intern.h" // own include
-
-/* ************************************************************** */
-/* Active F-Curve */
-
-/* Find 'active' F-Curve. It must be editable, since that's the purpose of
these buttons (subject to change).
- * We return the 'wrapper' since it contains valuable context info (about
hierarchy), which will need to be freed
- * when the caller is done with it.
- */
-bAnimListElem *get_active_fcurve_channel (bAnimContext *ac)
-{
- ListBase anim_data = {NULL, NULL};
- int filter= (ANIMFILTER_VISIBLE | ANIMFILTER_FOREDIT |
ANIMFILTER_ACTIVE | ANIMFILTER_CURVESONLY);
- int items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data,
ac->datatype);
-
- /* We take the first F-Curve only, since some other ones may have had
'active' flag set
- * if they were from linked data.
- */
- if (items) {
- bAnimListElem *ale= (bAnimListElem *)anim_data.first;
-
- /* remove first item from list, then free the rest of the list
and return the stored one */
- BLI_remlink(&anim_data, ale);
- BLI_freelistN(&anim_data);
-
- return ale;
- }
-
- /* no active F-Curve */
- return NULL;
-}
-
-/* ************************************************************** */
-/* Operator Polling Callbacks */
-
-/* check if any FModifiers to draw controls for - fcm is 'active' modifier
- * used for the polling callbacks + also for drawing
- */
-short fcurve_needs_draw_fmodifier_controls (FCurve *fcu, FModifier *fcm)
-{
- /* don't draw if there aren't any modifiers at all */
- if (fcu->modifiers.first == NULL)
- return 0;
-
- /* if there's an active modifier - don't draw if it doesn't drastically
- * alter the curve...
- */
- if (fcm) {
- switch (fcm->type) {
- /* clearly harmless */
- case FMODIFIER_TYPE_CYCLES:
- return 0;
-
- /* borderline... */
- case FMODIFIER_TYPE_NOISE:
- return 0;
- }
- }
-
- /* if only one modifier - don't draw if it is muted or disabled */
- if (fcu->modifiers.first == fcu->modifiers.last) {
- fcm= fcu->modifiers.first;
- if (fcm->flag & (FMODIFIER_FLAG_DISABLED|FMODIFIER_FLAG_MUTED))
- return 0;
- }
-
- /* if only active modifier - don't draw if it is muted or disabled */
- if (fcm) {
- if (fcm->flag & (FMODIFIER_FLAG_DISABLED|FMODIFIER_FLAG_MUTED))
- return 0;
- }
-
- /* if we're still here, this means that there are modifiers with
controls to be drawn */
- // FIXME: what happens if all the modifiers were muted/disabled
- return 1;
-}
-
-/* ------------------- */
-
-/* Check if there are any visible keyframes (for selection tools) */
-int graphop_visible_keyframes_poll (bContext *C)
-{
- bAnimContext ac;
- bAnimListElem *ale;
- ListBase anim_data = {NULL, NULL};
- ScrArea *sa= CTX_wm_area(C);
- int filter, items;
- short found = 0;
-
- /* firstly, check if in Graph Editor */
- // TODO: also check for region?
- if ((sa == NULL) || (sa->spacetype != SPACE_IPO))
- return 0;
-
- /* try to init Anim-Context stuff ourselves and check */
- if (ANIM_animdata_get_context(C, &ac) == 0)
- return 0;
-
- /* loop over the visible (selection doesn't matter) F-Curves, and see
if they're suitable
- * stopping on the first successful match
- */
- filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVESONLY);
- items = ANIM_animdata_filter(&ac, &anim_data, filter, ac.data,
ac.datatype);
- if (items == 0)
- return 0;
-
- for (ale = anim_data.first; ale; ale= ale->next) {
- FCurve *fcu= (FCurve *)ale->data;
- FModifier *fcm;
-
- /* visible curves for selection must fulfull the following
criteria:
- * - it has bezier keyframes
- * - F-Curve modifiers do not interfere with the result
too much
- * (i.e. the modifier-control drawing check returns
false)
- */
- if (fcu->bezt == NULL)
- continue;
- fcm= find_active_fmodifier(&fcu->modifiers);
-
- found= (fcurve_needs_draw_fmodifier_controls(fcu, fcm) == 0);
- if (found) break;
- }
-
- /* cleanup and return findings */
- BLI_freelistN(&anim_data);
- return found;
-}
-
-/* Check if there are any visible + editable keyframes (for editing tools) */
-int graphop_editable_keyframes_poll (bContext *C)
-{
- bAnimContext ac;
- bAnimListElem *ale;
- ListBase anim_data = {NULL, NULL};
- ScrArea *sa= CTX_wm_area(C);
- int filter, items;
- short found = 0;
-
- /* firstly, check if in Graph Editor */
- // TODO: also check for region?
- if ((sa == NULL) || (sa->spacetype != SPACE_IPO))
- return 0;
-
- /* try to init Anim-Context stuff ourselves and check */
- if (ANIM_animdata_get_context(C, &ac) == 0)
- return 0;
-
- /* loop over the editable (selected + editable) F-Curves, and see if
they're suitable
- * stopping on the first successful match
- */
- filter= (ANIMFILTER_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT |
ANIMFILTER_CURVESONLY);
- items = ANIM_animdata_filter(&ac, &anim_data, filter, ac.data,
ac.datatype);
- if (items == 0)
- return 0;
-
- for (ale = anim_data.first; ale; ale= ale->next) {
- FCurve *fcu= (FCurve *)ale->data;
- FModifier *fcm;
-
- /* editable curves must fulfull the following criteria:
- * - it has bezier keyframes
- * - it must not be protected from editing (this is
already checked for with the foredit flag
- * - F-Curve modifiers do not interfere with the result
too much
- * (i.e. the modifier-control drawing check returns
false)
- */
- if (fcu->bezt == NULL)
- continue;
- fcm= find_active_fmodifier(&fcu->modifiers);
-
- found= (fcurve_needs_draw_fmodifier_controls(fcu, fcm) == 0);
- if (found) break;
- }
-
- /* cleanup and return findings */
- BLI_freelistN(&anim_data);
- return found;
-}
-
-/* has active F-Curve that's editable */
-int graphop_active_fcurve_poll (bContext *C)
-{
- bAnimContext ac;
- bAnimListElem *ale;
- ScrArea *sa= CTX_wm_area(C);
- short has_fcurve= 0;
-
- /* firstly, check if in Graph Editor */
- // TODO: also check for region?
- if ((sa == NULL) || (sa->spacetype != SPACE_IPO))
- return 0;
-
- /* try to init Anim-Context stuff ourselves and check */
- if (ANIM_animdata_get_context(C, &ac) == 0)
- return 0;
-
- /* try to get the Active F-Curve */
- ale= get_active_fcurve_channel(&ac);
- if (ale == NULL)
- return 0;
-
- /* free temp data... */
- has_fcurve= ((ale->data) && (ale->type == ANIMTYPE_FCURVE));
- MEM_freeN(ale);
-
- /* return success */
- return has_fcurve;
-}
-
-/* ************************************************************** */
+/**
+ * $Id:
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
