Revision: 23733
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23733
Author: aligorith
Date: 2009-10-09 14:16:58 +0200 (Fri, 09 Oct 2009)
Log Message:
-----------
* Warning fixes for previous commit for Modifier renaming.
* Removed some old code (depsgraph) that was already commented out
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_hook.c
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2009-10-09
12:15:46 UTC (rev 23732)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2009-10-09
12:16:58 UTC (rev 23733)
@@ -2391,29 +2391,6 @@
ListBase targets = {NULL, NULL};
bConstraintTarget *ct;
-#if 0 // XXX old animation system... driver stuff to watch out for
- if(con->ipo) {
- IpoCurve *icu;
- for(icu= con->ipo->curve.first; icu; icu=
icu->next) {
- /* icu->driver->ob should actually
point to ob->proxy if it
- * is a proxy, but since it wasn't set
correct it older
- * files comparing with ob->proxy makes
it work for those */
- if(icu->driver && (icu->driver->ob==ob
|| icu->driver->ob==ob->proxy)) {
- bPoseChannel *target=
get_pose_channel(ob->pose, icu->driver->name);
- if(target) {
- node2 =
dag_get_node(dag, target);
- dag_add_relation(dag,
node2, node, 0, "Ipo Driver");
-
- /* uncommented this
line, results in dependencies
- * not being added
properly for this constraint,
- * what is the purpose
of this? - brecht */
- /*cti= NULL;*/ /*
trick to get next loop skipped */
- }
- }
- }
- }
-#endif // XXX old animation system... driver stuff to watch out for
-
if (cti && cti->get_constraint_targets) {
cti->get_constraint_targets(con, &targets);
@@ -2423,7 +2400,7 @@
if (target) {
node2=
dag_get_node(dag, target);
dag_add_relation(dag,
node2, node, 0, "IK Constraint");
-
+
if
(con->type==CONSTRAINT_TYPE_KINEMATIC) {
bKinematicConstraint *data = (bKinematicConstraint *)con->data;
bPoseChannel
*parchan;
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2009-10-09
12:15:46 UTC (rev 23732)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2009-10-09
12:16:58 UTC (rev 23733)
@@ -1208,12 +1208,13 @@
int a;
- // XXX old animation system!
+ // XXX old animation system!
--------------------------------------
for (strip=ob->nlastrips.first; strip; strip=strip->next){
LIBTAG(strip->object);
LIBTAG(strip->act);
LIBTAG(strip->ipo);
}
+ // XXX: new animation system needs something like this?
for(a=0; a<ob->totcol; a++) {
LIBTAG(ob->mat[a]);
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-10-09
12:15:46 UTC (rev 23732)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-10-09
12:16:58 UTC (rev 23733)
@@ -4096,7 +4096,7 @@
BLI_addhead(&ob->modifiers, hmd);
BLI_remlink(&ob->hooks, hook);
- modifier_unique_name(&ob->modifiers, hmd);
+ modifier_unique_name(&ob->modifiers, (ModifierData*)hmd);
MEM_freeN(hook);
}
@@ -7662,7 +7662,7 @@
BLI_addtail(&ob->modifiers, smd);
- modifier_unique_name(&ob->modifiers,
smd);
+ modifier_unique_name(&ob->modifiers,
(ModifierData*)smd);
}
}
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2009-10-09
12:15:46 UTC (rev 23732)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2009-10-09
12:16:58 UTC (rev 23733)
@@ -848,7 +848,7 @@
BooleanModifierData *bmd = NULL;
bmd =
(BooleanModifierData *)modifier_new(eModifierType_Boolean);
BLI_addtail(&ob->modifiers, bmd);
-
modifier_unique_name(&ob->modifiers, bmd);
+
modifier_unique_name(&ob->modifiers, (ModifierData*)bmd);
bmd->object =
base_select->object;
bmd->modifier.mode |= eModifierMode_Realtime;
switch(nr){
@@ -981,7 +981,7 @@
SubsurfModifierData *smd =
(SubsurfModifierData*) modifier_new(eModifierType_Subsurf);
BLI_addtail(&ob->modifiers, smd);
- modifier_unique_name(&ob->modifiers, smd);
+ modifier_unique_name(&ob->modifiers,
(ModifierData*)smd);
if (level!=-1) {
smd->levels = level;
Modified: trunk/blender/source/blender/editors/object/object_hook.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_hook.c 2009-10-09
12:15:46 UTC (rev 23732)
+++ trunk/blender/source/blender/editors/object/object_hook.c 2009-10-09
12:16:58 UTC (rev 23733)
@@ -480,7 +480,7 @@
hmd = (HookModifierData*)
modifier_new(eModifierType_Hook);
BLI_insertlinkbefore(&obedit->modifiers, md,
hmd);
sprintf(hmd->modifier.name, "Hook-%s",
ob->id.name+2);
- modifier_unique_name(&obedit->modifiers, hmd);
+ modifier_unique_name(&obedit->modifiers,
(ModifierData*)hmd);
}
else if (hmd->indexar) MEM_freeN(hmd->indexar); /*
reassign, hook was set */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
