[Bf-blender-cvs] [27496cc46bb] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Tue Jul 31 10:44:18 CEST 2018


Commit: 27496cc46bbfd76e98ad3b1ccb8fea534763ffb5
Author: Campbell Barton
Date:   Tue Jul 31 18:43:37 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB27496cc46bbfd76e98ad3b1ccb8fea534763ffb5

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/object/object_shapekey.c
index 5e66dc00fd2,e67b62ea624..30fb2896670
--- a/source/blender/editors/object/object_shapekey.c
+++ b/source/blender/editors/object/object_shapekey.c
@@@ -378,10 -376,12 +378,12 @@@ static int shape_key_retime_exec(bConte
  	if (!key || !kb)
  		return OPERATOR_CANCELLED;
  
- 	for (kb = key->block.first; kb; kb = kb->next)
- 		kb->pos = (cfra += 0.1f);
+ 	for (kb = key->block.first; kb; kb = kb->next) {
+ 		kb->pos = cfra;
+ 		cfra += 0.1f;
+ 	}
  
 -	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 +	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
  	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
  
  	return OPERATOR_FINISHED;



More information about the Bf-blender-cvs mailing list