[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34118] trunk/blender/source/blender/ editors: use ED_markers_get_first_selected() where possible, simplify ed_marker_rename_exec
Campbell Barton
ideasman42 at gmail.com
Thu Jan 6 05:35:58 CET 2011
Revision: 34118
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34118
Author: campbellbarton
Date: 2011-01-06 05:35:57 +0100 (Thu, 06 Jan 2011)
Log Message:
-----------
use ED_markers_get_first_selected() where possible, simplify ed_marker_rename_exec
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/space_action/action_edit.c
trunk/blender/source/blender/editors/space_graph/graph_edit.c
Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c 2011-01-06 04:01:06 UTC (rev 34117)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c 2011-01-06 04:35:57 UTC (rev 34118)
@@ -1192,29 +1192,19 @@
/* rename first selected TimeMarker */
static int ed_marker_rename_exec(bContext *C, wmOperator *op)
{
- ListBase *markers= context_get_markers(C);
- TimeMarker *marker;
- short changed= 0;
-
- if (markers == NULL)
- return OPERATOR_CANCELLED;
-
- for (marker= markers->first; marker; marker= marker->next) {
- if (marker->flag & SELECT) {
- /* directly get new name */
- RNA_string_get(op->ptr, "name", marker->name);
-
- changed= 1;
- break;
- }
- }
-
- if (changed) {
+ TimeMarker *marker= ED_markers_get_first_selected(context_get_markers(C));
+
+ if(marker) {
+ RNA_string_get(op->ptr, "name", marker->name);
+
WM_event_add_notifier(C, NC_SCENE|ND_MARKERS, NULL);
WM_event_add_notifier(C, NC_ANIMATION|ND_MARKERS, NULL);
+
+ return OPERATOR_FINISHED;
}
-
- return OPERATOR_FINISHED;
+ else {
+ return OPERATOR_CANCELLED;
+ }
}
static int ed_marker_rename_invoke_wrapper(bContext *C, wmOperator *op, wmEvent *evt)
@@ -1244,7 +1234,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- ot->prop = RNA_def_string(ot->srna, "name", "RenamedMarker", 64, "Name", "New name for marker");
+ ot->prop = RNA_def_string(ot->srna, "name", "RenamedMarker", sizeof(((TimeMarker *)NULL)->name), "Name", "New name for marker");
//RNA_def_boolean(ot->srna, "ensure_unique", 0, "Ensure Unique", "Ensure that new name is unique within collection of markers");
}
Modified: trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c 2011-01-06 04:01:06 UTC (rev 34117)
+++ trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c 2011-01-06 04:35:57 UTC (rev 34118)
@@ -668,15 +668,10 @@
}
else {
/* try to find a marker */
- for (marker= scene->markers.first; marker; marker=marker->next) {
- if (marker->flag & SELECT) {
- initialised = 1;
- break;
- }
+ marker= ED_markers_get_first_selected(&scene->markers);
+ if(marker) {
+ initialised= 1;
}
-
- if (initialised == 0)
- marker = NULL;
}
}
Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c 2011-01-06 04:01:06 UTC (rev 34117)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c 2011-01-06 04:35:57 UTC (rev 34118)
@@ -798,7 +798,7 @@
if(block->active && block->panel)
ui_offset_panel_block(block);
- /* consistancy; are panels not made, whilst they have tabs */
+ /* consistency; are panels not made, whilst they have tabs */
for(panot= ar->panels.first; panot; panot= panot->next) {
if((panot->runtime_flag & PNL_ACTIVE)==0) { // not made
Modified: trunk/blender/source/blender/editors/space_action/action_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_edit.c 2011-01-06 04:01:06 UTC (rev 34117)
+++ trunk/blender/source/blender/editors/space_action/action_edit.c 2011-01-06 04:35:57 UTC (rev 34118)
@@ -57,6 +57,7 @@
#include "ED_keyframes_edit.h"
#include "ED_screen.h"
#include "ED_transform.h"
+#include "ED_markers.h"
#include "WM_api.h"
#include "WM_types.h"
@@ -1298,13 +1299,7 @@
TimeMarker *marker= NULL;
/* find first selected marker */
- if (ac->markers) {
- for (marker= ac->markers->first; marker; marker=marker->next) {
- if (marker->flag & SELECT) {
- break;
- }
- }
- }
+ marker= ED_markers_get_first_selected(ac->markers);
/* store marker's time (if available) */
if (marker)
Modified: trunk/blender/source/blender/editors/space_graph/graph_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_edit.c 2011-01-06 04:01:06 UTC (rev 34117)
+++ trunk/blender/source/blender/editors/space_graph/graph_edit.c 2011-01-06 04:35:57 UTC (rev 34118)
@@ -60,6 +60,7 @@
#include "ED_keyframes_edit.h"
#include "ED_screen.h"
#include "ED_transform.h"
+#include "ED_markers.h"
#include "WM_api.h"
#include "WM_types.h"
@@ -1769,13 +1770,7 @@
TimeMarker *marker= NULL;
/* find first selected marker */
- if (ac->markers) {
- for (marker= ac->markers->first; marker; marker=marker->next) {
- if (marker->flag & SELECT) {
- break;
- }
- }
- }
+ marker= ED_markers_get_first_selected(ac->markers);
/* store marker's time (if available) */
if (marker)
More information about the Bf-blender-cvs
mailing list