Cycles: Improved robustness of hair motion blur.motion_curve_fix

In some instances, the number of control vertices of a hair could change mid-frame.
Cycles would then be unable to calculate proper motion blur for those hairs. This adds
interpolated CVs to fill in for the missing data. While this will not necessarily result in
a fully accurate reconstruction of the guide hair, it preserves motion blur instead of disabling it.

Reviewers: #cycles, sergey

Reviewed By: #cycles, sergey

Subscribers: sergey, brecht, #cycles

Tags: #cycles

Differential Revision: https://developer.blender.org/D3695

1 files changed, 38 insertions, 38 deletions

diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 0366ef3a026..c125c129e1d 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -251,10 +251,10 @@ static void select_pchan_for_action_group(bAnimContext *ac, bActionGroup *agrp,
 }
 
 /* Deselect all animation channels
- *	- data: pointer to datatype, as contained in bAnimContext
- *	- datatype: the type of data that 'data' represents (eAnimCont_Types)
- *	- test: check if deselecting instead of selecting
- *	- sel: eAnimChannels_SetFlag;
+ * - data: pointer to datatype, as contained in bAnimContext
+ * - datatype: the type of data that 'data' represents (eAnimCont_Types)
+ * - test: check if deselecting instead of selecting
+ * - sel: eAnimChannels_SetFlag;
  */
 void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, eAnimCont_Types datatype, bool test, eAnimChannels_SetFlag sel)
 {
@@ -450,13 +450,13 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, eAnimCont_Types d
 /* ---------------------------- Graph Editor ------------------------------------- */
 
 /* Flush visibility (for Graph Editor) changes up/down hierarchy for changes in the given setting
- *	- anim_data: list of the all the anim channels that can be chosen
- *		-> filtered using ANIMFILTER_CHANNELS only, since if we took VISIBLE too,
- *		  then the channels under closed expanders get ignored...
- *	- ale_setting: the anim channel (not in the anim_data list directly, though occurring there)
- *		with the new state of the setting that we want flushed up/down the hierarchy
- *	- setting: type of setting to set
- *	- on: whether the visibility setting has been enabled or disabled
+ * - anim_data: list of the all the anim channels that can be chosen
+ *   -> filtered using ANIMFILTER_CHANNELS only, since if we took VISIBLE too,
+ *      then the channels under closed expanders get ignored...
+ * - ale_setting: the anim channel (not in the anim_data list directly, though occurring there)
+ *   with the new state of the setting that we want flushed up/down the hierarchy
+ * - setting: type of setting to set
+ * - on: whether the visibility setting has been enabled or disabled
  */
 void ANIM_flush_setting_anim_channels(bAnimContext *ac, ListBase *anim_data, bAnimListElem *ale_setting, eAnimChannel_Settings setting, eAnimChannels_SetFlag mode)
 {
@@ -505,12 +505,12 @@ void ANIM_flush_setting_anim_channels(bAnimContext *ac, ListBase *anim_data, bAn
 	/* flush up?
 	 *
 	 * For Visibility:
-	 *	- only flush up if the current state is now enabled (positive 'on' state is default)
-	 *	  (otherwise, it's too much work to force the parents to be inactive too)
+	 * - only flush up if the current state is now enabled (positive 'on' state is default)
+	 *   (otherwise, it's too much work to force the parents to be inactive too)
 	 *
 	 * For everything else:
-	 *	- only flush up if the current state is now disabled (negative 'off' state is default)
-	 *	  (otherwise, it's too much work to force the parents to be active too)
+	 * - only flush up if the current state is now disabled (negative 'off' state is default)
+	 *   (otherwise, it's too much work to force the parents to be active too)
 	 */
 	if ( ((setting == ACHANNEL_SETTING_VISIBLE) && (mode != ACHANNEL_SETFLAG_CLEAR)) ||
 	     ((setting != ACHANNEL_SETTING_VISIBLE) && (mode == ACHANNEL_SETFLAG_CLEAR)))
@@ -597,17 +597,17 @@ void ANIM_flush_setting_anim_channels(bAnimContext *ac, ListBase *anim_data, bAn
 void ANIM_fcurve_delete_from_animdata(bAnimContext *ac, AnimData *adt, FCurve *fcu)
 {
 	/* - if no AnimData, we've got nowhere to remove the F-Curve from
-	 *	(this doesn't guarantee that the F-Curve is in there, but at least we tried
+	 *   (this doesn't guarantee that the F-Curve is in there, but at least we tried
 	 * - if no F-Curve, there is nothing to remove
 	 */
 	if (ELEM(NULL, adt, fcu))
 		return;
 
 	/* remove from whatever list it came from
-	 *	- Action Group
-	 *	- Action
-	 *	- Drivers
-	 *	- TODO... some others?
+	 * - Action Group
+	 * - Action
+	 * - Drivers
+	 * - TODO... some others?
 	 */
 	if ((ac) && (ac->datatype == ANIMCONT_DRIVERS)) {
 		/* driver F-Curve */
@@ -1010,8 +1010,8 @@ static bool rearrange_animchannel_islands(ListBase *list, AnimChanRearrangeFp re
 	}
 
 	/* perform moving of selected islands now, but only if there is more than one of 'em so that something will happen
-	 *	- scanning of the list is performed in the opposite direction to the direction we're moving things, so that we
-	 *	  shouldn't need to encounter items we've moved already
+	 * - scanning of the list is performed in the opposite direction to the direction we're moving things, so that we
+	 *   shouldn't need to encounter items we've moved already
 	 */
 	if (islands.first != islands.last) {
 		tReorderChannelIsland *first = (mode > 0) ? islands.last : islands.first;
@@ -1039,7 +1039,7 @@ static bool rearrange_animchannel_islands(ListBase *list, AnimChanRearrangeFp re
 
 /* Change the order NLA Tracks within NLA Stack
  * ! NLA tracks are displayed in opposite order, so directions need care
- *	mode: REARRANGE_ANIMCHAN_*
+ * mode: REARRANGE_ANIMCHAN_*
  */
 static void rearrange_nla_channels(bAnimContext *ac, AnimData *adt, eRearrangeAnimChan_Mode mode)
 {
@@ -1067,7 +1067,7 @@ static void rearrange_nla_channels(bAnimContext *ac, AnimData *adt, eRearrangeAn
 /* Drivers Specific Stuff ------------------------------------------------- */
 
 /* Change the order drivers within AnimData block
- *	mode: REARRANGE_ANIMCHAN_*
+ * mode: REARRANGE_ANIMCHAN_*
  */
 static void rearrange_driver_channels(bAnimContext *ac, AnimData *adt, eRearrangeAnimChan_Mode mode)
 {
@@ -1182,7 +1182,7 @@ static void join_groups_action_temp(bAction *act)
 }
 
 /* Change the order of anim-channels within action
- *	mode: REARRANGE_ANIMCHAN_*
+ * mode: REARRANGE_ANIMCHAN_*
  */
 static void rearrange_action_channels(bAnimContext *ac, bAction *act, eRearrangeAnimChan_Mode mode)
 {
@@ -1203,8 +1203,8 @@ static void rearrange_action_channels(bAnimContext *ac, bAction *act, eRearrange
 	rearrange_animchannels_filter_visible(&anim_data_visible, ac, ANIMTYPE_GROUP);
 
 	/* rearrange groups first
-	 *	- the group's channels will only get considered if nothing happened when rearranging the groups
-	 *	  i.e. the rearrange function returned 0
+	 * - the group's channels will only get considered if nothing happened when rearranging the groups
+	 *   i.e. the rearrange function returned 0
 	 */
 	do_channels = (rearrange_animchannel_islands(&act->groups, rearrange_func, mode, ANIMTYPE_GROUP,
 	                                             &anim_data_visible) == 0);
@@ -1790,9 +1790,9 @@ static const EnumPropertyItem prop_animchannel_settings_types[] = {
 /* ------------------- */
 
 /* Set/clear a particular flag (setting) for all selected + visible channels
- *	setting: the setting to modify
- *	mode: eAnimChannels_SetFlag
- *	onlysel: only selected channels get the flag set
+ * setting: the setting to modify
+ * mode: eAnimChannels_SetFlag
+ * onlysel: only selected channels get the flag set
  */
 // TODO: enable a setting which turns flushing on/off?
 static void setflag_anim_channels(bAnimContext *ac, eAnimChannel_Settings setting, eAnimChannels_SetFlag mode, bool onlysel, bool flush)
@@ -1885,7 +1885,7 @@ static int animchannels_setflag_exec(bContext *C, wmOperator *op)
 		flush = false;
 
 	/* modify setting
-	 *	- only selected channels are affected
+	 * - only selected channels are affected
 	 */
 	setflag_anim_channels(&ac, setting, mode, true, flush);
 
@@ -2576,8 +2576,8 @@ static int animchannels_channel_get(bAnimContext *ac, const int mval[2])
 
 	/* figure out which channel user clicked in
 	 * Note: although channels technically start at (y = ACHANNEL_FIRST), we need to adjust by half a channel's height
-	 *		so that the tops of channels get caught ok. Since ACHANNEL_FIRST is really ACHANNEL_HEIGHT, we simply use
-	 *		ACHANNEL_HEIGHT_HALF.
+	 *       so that the tops of channels get caught ok. Since ACHANNEL_FIRST is really ACHANNEL_HEIGHT, we simply use
+	 *       ACHANNEL_HEIGHT_HALF.
 	 */
 	UI_view2d_region_to_view(v2d, mval[0], mval[1], &x, &y);
 
@@ -2808,7 +2808,7 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index,
 				agrp->flag ^= AGRP_SELECTED;
 			}
 			else if (selectmode == -1) {
-				/* select all in group (and deselect everthing else) */
+				/* select all in group (and deselect everything else) */
 				FCurve *fcu;
 
 				/* deselect all other channels */
@@ -2900,7 +2900,7 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index,
 			bGPdata *gpd = (bGPdata *)ale->data;
 
 			/* toggle expand
-			 *	- although the triangle widget already allows this, the whole channel can also be used for this purpose
+			 * - although the triangle widget already allows this, the whole channel can also be used for this purpose
 			 */
 			gpd->flag ^= GP_DATA_EXPAND;
 
@@ -2936,7 +2936,7 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index,
 			Mask *mask = (Mask *)ale->data;
 
 			/* toggle expand
-			 *	- although the triangle widget already allows this, the whole channel can also be used for this purpose
+			 * - although the triangle widget already allows this, the whole channel can also be used for this purpose
 			 */
 			mask->flag ^= MASK_ANIMF_EXPAND;
 
@@ -3006,8 +3006,8 @@ static int animchannels_mouseclick_invoke(bContext *C, wmOperator *op, const wmE
 
 	/* figure out which channel user clicked in
 	 * Note: although channels technically start at (y = ACHANNEL_FIRST), we need to adjust by half a channel's height
-	 *		so that the tops of channels get caught ok. Since ACHANNEL_FIRST is really ACHANNEL_HEIGHT, we simply use
-	 *		ACHANNEL_HEIGHT_HALF.
+	 *       so that the tops of channels get caught ok. Since ACHANNEL_FIRST is really ACHANNEL_HEIGHT, we simply use
+	 *       ACHANNEL_HEIGHT_HALF.
 	 */
 	UI_view2d_region_to_view(v2d, event->mval[0], event->mval[1], &x, &y);
 	UI_view2d_listview_view_to_cell(v2d, ACHANNEL_NAMEWIDTH, ACHANNEL_STEP(&ac), 0, (float)ACHANNEL_HEIGHT_HALF(&ac), x, y, NULL, &channel_index);