[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57356] branches/soc-2011-tomato/source/ blender/editors/mask/mask_shapekey.c: Remove workarounds for mask depsraph issue,

Sergey Sharybin sergey.vfx at gmail.com
Mon Jun 10 17:11:07 CEST 2013


Revision: 57356
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57356
Author:   nazgul
Date:     2013-06-10 15:11:06 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
Remove workarounds for mask depsraph issue,

They're not needed after recent trunk merge.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c

Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c	2013-06-10 14:28:34 UTC (rev 57355)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c	2013-06-10 15:11:06 UTC (rev 57356)
@@ -124,9 +124,6 @@
 	}
 
 	if (change) {
-		Scene *scene = CTX_data_scene(C);
-		BKE_mask_evaluate(mask, CFRA, TRUE);
-
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
 		DAG_id_tag_update(&mask->id, OB_RECALC_DATA);
 
@@ -533,11 +530,8 @@
 	}
 
 	if (removed_count > 0) {
-		Scene *scene = CTX_data_scene(C);
-		BKE_mask_evaluate(mask, CFRA, TRUE);
-
 		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-		DAG_id_tag_update(&mask->id, 0);
+		DAG_id_tag_update(&mask->id, OB_RECALC_DATA);
 	}
 
 	BKE_reportf(op->reports, RPT_INFO, "Removed %d keys", removed_count);




More information about the Bf-blender-cvs mailing list