[Bf-blender-cvs] [aca714c18fc] greasepencil-object: Fix merge error

Antonio Vazquez noreply at git.blender.org
Wed Aug 23 13:29:11 CEST 2017


Commit: aca714c18fcb102f6325b73c8787eb606ade7711
Author: Antonio Vazquez
Date:   Wed Aug 23 13:28:41 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBaca714c18fcb102f6325b73c8787eb606ade7711

Fix merge error

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

M	source/blender/blenkernel/intern/object_deform.c

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

diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c
index b25b2baa791..7fa380a5390 100644
--- a/source/blender/blenkernel/intern/object_deform.c
+++ b/source/blender/blenkernel/intern/object_deform.c
@@ -412,7 +412,8 @@ void BKE_object_defgroup_remove(Object *ob, bDeformGroup *defgroup)
 		else
 			object_defgroup_remove_object_mode(ob, defgroup);
 
-	BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
+		BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
+	}
 }
 
 /**



More information about the Bf-blender-cvs mailing list