[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45676] trunk/blender/source/blender: bmesh todos:
Campbell Barton
ideasman42 at gmail.com
Mon Apr 16 10:04:13 CEST 2012
Revision: 45676
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45676
Author: campbellbarton
Date: 2012-04-16 08:04:12 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
bmesh todos:
- curve undo now runs ED_curve_updateAnimPaths() again.
- comment out unneeded index setting.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/include/ED_curve.h
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2012-04-16 06:48:57 UTC (rev 45675)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2012-04-16 08:04:12 UTC (rev 45676)
@@ -52,7 +52,7 @@
BMW_init(®walker, bm, BMW_ISLAND,
BMW_MASK_NOP, BMW_MASK_NOP, FACE_MARK,
- BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */
+ BMW_FLAG_NOP,
BMW_NIL_LAY);
f2 = BMW_begin(®walker, f);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_mirror.c 2012-04-16 06:48:57 UTC (rev 45675)
+++ trunk/blender/source/blender/bmesh/operators/bmo_mirror.c 2012-04-16 08:04:12 UTC (rev 45676)
@@ -73,11 +73,7 @@
BMO_ITER(v, &siter, bm, &dupeop, "newout", BM_VERT) {
BLI_array_growone(vmap);
vmap[i] = v;
-
- /* BMESH_TODO, double check this is being used, calling following operators will overwrite anyway - campbell */
- BM_elem_index_set(v2, i); /* set_dirty! */
v2 = BM_iter_step(&iter);
-
i++;
}
bm->elem_index_dirty |= BM_VERT;
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2012-04-16 06:48:57 UTC (rev 45675)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2012-04-16 08:04:12 UTC (rev 45676)
@@ -1015,9 +1015,8 @@
/* ********************* Amimation data *************** */
-static int curve_is_animated(Object *ob)
+static int curve_is_animated(Curve *cu)
{
- Curve *cu= (Curve*)ob->data;
AnimData *ad= BKE_animdata_from_id(&cu->id);
return ad && (ad->action || ad->drivers.first);
@@ -1063,10 +1062,9 @@
free_fcurve(fcu);
}
-static void curve_rename_fcurves(Object *obedit, ListBase *orig_curves)
+static void curve_rename_fcurves(Curve *cu, ListBase *orig_curves)
{
int nu_index= 0, a, pt_index;
- Curve *cu= (Curve*)obedit->data;
EditNurb *editnurb= cu->editnurb;
Nurb *nu= editnurb->nurbs.first;
CVKeyIndex *keyIndex;
@@ -1178,17 +1176,16 @@
}
/* return 0 if animation data wasn't changed, 1 otherwise */
-int ED_curve_updateAnimPaths(Object *obedit)
+int ED_curve_updateAnimPaths(Curve *cu)
{
- Curve *cu= (Curve*)obedit->data;
AnimData *ad= BKE_animdata_from_id(&cu->id);
- if (!curve_is_animated(obedit)) return 0;
+ if (!curve_is_animated(cu)) return 0;
if (ad->action)
- curve_rename_fcurves(obedit, &ad->action->curves);
+ curve_rename_fcurves(cu, &ad->action->curves);
- curve_rename_fcurves(obedit, &ad->drivers);
+ curve_rename_fcurves(cu, &ad->drivers);
return 1;
}
@@ -1221,7 +1218,7 @@
cu->nurb= newnurb;
calc_shapeKeys(obedit);
- ED_curve_updateAnimPaths(obedit);
+ ED_curve_updateAnimPaths(obedit->data);
freeNurblist(&oldnurb);
}
@@ -1702,7 +1699,7 @@
nu= next;
}
- if (ED_curve_updateAnimPaths(obedit))
+ if (ED_curve_updateAnimPaths(obedit->data))
WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
return OPERATOR_FINISHED;
@@ -2017,7 +2014,7 @@
keyData_switchDirectionNurb(cu, nu);
}
- if (ED_curve_updateAnimPaths(obedit))
+ if (ED_curve_updateAnimPaths(obedit->data))
WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
DAG_id_tag_update(obedit->data, 0);
@@ -3191,7 +3188,7 @@
subdividenurb(obedit, number_cuts);
- if (ED_curve_updateAnimPaths(obedit))
+ if (ED_curve_updateAnimPaths(obedit->data))
WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
@@ -3512,7 +3509,7 @@
}
if (changed) {
- if (ED_curve_updateAnimPaths(obedit))
+ if (ED_curve_updateAnimPaths(obedit->data))
WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
DAG_id_tag_update(obedit->data, 0);
@@ -4104,7 +4101,7 @@
return OPERATOR_CANCELLED;
}
- if (ED_curve_updateAnimPaths(obedit))
+ if (ED_curve_updateAnimPaths(obedit->data))
WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
@@ -4323,7 +4320,7 @@
return OPERATOR_CANCELLED;
}
- if (ED_curve_updateAnimPaths(obedit))
+ if (ED_curve_updateAnimPaths(obedit->data))
WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
@@ -4626,7 +4623,7 @@
if (ok) {
test2DNurb(nu);
- if (ED_curve_updateAnimPaths(obedit))
+ if (ED_curve_updateAnimPaths(obedit->data))
WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
@@ -4719,7 +4716,7 @@
}
else {
if (extrudeflagNurb(editnurb, 1)) { /* '1'= flag */
- if (ED_curve_updateAnimPaths(obedit))
+ if (ED_curve_updateAnimPaths(obedit->data))
WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
@@ -5640,7 +5637,7 @@
keyIndex_delNurbList(editnurb, nubase);
freeNurblist(nubase);
- if (ED_curve_updateAnimPaths(obedit))
+ if (ED_curve_updateAnimPaths(obedit->data))
WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
}
@@ -5941,7 +5938,7 @@
freeNurblist(nubase);
}
- if (ED_curve_updateAnimPaths(obedit))
+ if (ED_curve_updateAnimPaths(obedit->data))
WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, obedit);
WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
@@ -6987,10 +6984,7 @@
cu->lastsel= lastsel;
cu->actnu= undoCurve->actnu;
- /* BMESH_TODO */
-#if 0
- ED_curve_updateAnimPaths(obedit);
-#endif
+ ED_curve_updateAnimPaths(cu);
}
static void *editCurve_to_undoCurve(void *UNUSED(edata), void *cu_v)
Modified: trunk/blender/source/blender/editors/include/ED_curve.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_curve.h 2012-04-16 06:48:57 UTC (rev 45675)
+++ trunk/blender/source/blender/editors/include/ED_curve.h 2012-04-16 08:04:12 UTC (rev 45676)
@@ -87,7 +87,7 @@
void ED_curve_beztcpy(struct EditNurb *editnurb, struct BezTriple *dst, struct BezTriple *src, int count);
void ED_curve_bpcpy(struct EditNurb *editnurb, struct BPoint *dst, struct BPoint *src, int count);
-int ED_curve_updateAnimPaths(struct Object *obedit);
+int ED_curve_updateAnimPaths(struct Curve *cu);
int ED_curve_actSelection(struct Curve *cu, float center[3]);
More information about the Bf-blender-cvs
mailing list