Revision: 37859
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37859
Author: aligorith
Date: 2011-06-27 13:04:21 +0000 (Mon, 27 Jun 2011)
Log Message:
-----------
Small bug fixes:
* Removing the last of the owner/ownertype stuff. The bulk of this
stuff was removed in Part3 of the refactor, but it seems I forgot to
actually remove these struct members at the end of that.
* Texture datablocks without animdata aren't skipped immediately
anymore. This could lead to texture nodetrees on animdata-less
textures getting skipped.
Modified Paths:
--------------
branches/soc-2011-pepper/source/blender/editors/animation/anim_filter.c
branches/soc-2011-pepper/source/blender/editors/include/ED_anim_api.h
Modified:
branches/soc-2011-pepper/source/blender/editors/animation/anim_filter.c
===================================================================
--- branches/soc-2011-pepper/source/blender/editors/animation/anim_filter.c
2011-06-27 12:48:30 UTC (rev 37858)
+++ branches/soc-2011-pepper/source/blender/editors/animation/anim_filter.c
2011-06-27 13:04:21 UTC (rev 37859)
@@ -1359,7 +1359,7 @@
size_t tmp_items = 0;
/* for now, if no texture returned, skip (this shouldn't
confuse the user I hope) */
- if (ELEM(NULL, tex, tex->adt))
+ if (tex == NULL)
continue;
/* add texture's animation data to temp collection */
@@ -1753,6 +1753,7 @@
}
END_ANIMFILTER_SUBCHANNELS;
+
/* if we collected some channels, add these to the new list... */
if (tmp_items) {
/* firstly add object expander if required */
Modified: branches/soc-2011-pepper/source/blender/editors/include/ED_anim_api.h
===================================================================
--- branches/soc-2011-pepper/source/blender/editors/include/ED_anim_api.h
2011-06-27 12:48:30 UTC (rev 37858)
+++ branches/soc-2011-pepper/source/blender/editors/include/ED_anim_api.h
2011-06-27 13:04:21 UTC (rev 37859)
@@ -116,9 +116,6 @@
struct ID *id; /* ID block that channel is attached to
*/
struct AnimData *adt; /* source of the animation data attached to ID
block (for convenience) */
-
- void *owner; /* group or channel which acts as this
channel's owner */
- short ownertype; /* type of owner */
} bAnimListElem;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
