[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39746] branches/soc-2011-pepper/source/ blender: Assorted comment clarification in response to code review notes
Joshua Leung
aligorith at gmail.com
Sun Aug 28 13:39:19 CEST 2011
Revision: 39746
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39746
Author: aligorith
Date: 2011-08-28 11:39:18 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
Assorted comment clarification in response to code review notes
Modified Paths:
--------------
branches/soc-2011-pepper/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-pepper/source/blender/editors/animation/drivers.c
branches/soc-2011-pepper/source/blender/editors/space_nla/nla_draw.c
Modified: branches/soc-2011-pepper/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/soc-2011-pepper/source/blender/blenkernel/intern/anim_sys.c 2011-08-28 09:28:41 UTC (rev 39745)
+++ branches/soc-2011-pepper/source/blender/blenkernel/intern/anim_sys.c 2011-08-28 11:39:18 UTC (rev 39746)
@@ -1168,7 +1168,7 @@
* for we know that which the updates in RNA were really just for
* flushing property editing via UI/Py
*/
- if (RNA_struct_is_a(new_ptr.type, &RNA_PoseBone)) {
+ if (new_ptr.type == &RNA_PoseBone) {
/* bone transforms - update pose (i.e. tag depsgraph) */
skip_updates_hack = 1;
}
Modified: branches/soc-2011-pepper/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/soc-2011-pepper/source/blender/blenkernel/intern/depsgraph.c 2011-08-28 09:28:41 UTC (rev 39745)
+++ branches/soc-2011-pepper/source/blender/blenkernel/intern/depsgraph.c 2011-08-28 11:39:18 UTC (rev 39746)
@@ -2062,8 +2062,19 @@
return 1;
}
- /* experimental check: if we have drivers, more likely than not, on a frame change
+ /* If we have drivers, more likely than not, on a frame change
* they'll need updating because their owner changed
+ *
+ * This is kindof a hack to get around a whole host of problems
+ * involving drivers using non-object datablock data (which the
+ * depsgraph currently has no way of representing let alone correctly
+ * dependency sort+tagging). By doing this, at least we ensure that
+ * some commonly attempted drivers (such as scene -> current frame;
+ * see "Driver updates fail" thread on Bf-committers dated July 2)
+ * will work correctly, and that other non-object datablocks will have
+ * their drivers update at least on frame change.
+ *
+ * -- Aligorith, July 4 2011
*/
if (adt->drivers.first)
return 1;
Modified: branches/soc-2011-pepper/source/blender/editors/animation/drivers.c
===================================================================
--- branches/soc-2011-pepper/source/blender/editors/animation/drivers.c 2011-08-28 09:28:41 UTC (rev 39745)
+++ branches/soc-2011-pepper/source/blender/editors/animation/drivers.c 2011-08-28 11:39:18 UTC (rev 39746)
@@ -383,7 +383,6 @@
/* modifiers */
copy_fmodifiers(&fcu->modifiers, &channeldriver_copypaste_buf->modifiers);
- /* flags - on a per-relevant-flag basis */
/* extrapolation mode */
fcu->extend= channeldriver_copypaste_buf->extend;
Modified: branches/soc-2011-pepper/source/blender/editors/space_nla/nla_draw.c
===================================================================
--- branches/soc-2011-pepper/source/blender/editors/space_nla/nla_draw.c 2011-08-28 09:28:41 UTC (rev 39745)
+++ branches/soc-2011-pepper/source/blender/editors/space_nla/nla_draw.c 2011-08-28 11:39:18 UTC (rev 39746)
@@ -471,10 +471,7 @@
sprintf(str, "%d) Temp-Meta", index);
}
else {
- if (strip->flag & NLASTRIP_FLAG_REVERSE)
- sprintf(str, "%s", strip->name);
- else
- sprintf(str, "%s", strip->name);
+ sprintf(str, strip->name);
}
/* set text color - if colors (see above) are light, draw black text, otherwise draw white */
More information about the Bf-blender-cvs
mailing list