[Bf-blender-cvs] [8677c76f138] master: Fix (unreported) broken uvsculpt in Scene's toolsettings' copying.

Bastien Montagne noreply at git.blender.org
Mon Jul 10 21:23:42 CEST 2017


Commit: 8677c76f138e96cf05e2acd2bf3bec480a983223
Author: Bastien Montagne
Date:   Mon Jul 10 21:16:48 2017 +0200
Branches: master
https://developer.blender.org/rB8677c76f138e96cf05e2acd2bf3bec480a983223

Fix (unreported) broken uvsculpt in Scene's toolsettings' copying.

This was serious bug actually, probably a crasher in case you free
original or copy after duplication...

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

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

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 4c8b07574af..a15f270a3ee 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -288,6 +288,10 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
 			ts->sculpt = MEM_dupallocN(ts->sculpt);
 			BKE_paint_copy(&ts->sculpt->paint, &ts->sculpt->paint);
 		}
+		if (ts->uvsculpt) {
+			ts->uvsculpt = MEM_dupallocN(ts->uvsculpt);
+			BKE_paint_copy(&ts->uvsculpt->paint, &ts->uvsculpt->paint);
+		}
 
 		BKE_paint_copy(&ts->imapaint.paint, &ts->imapaint.paint);
 		ts->imapaint.paintcursor = NULL;




More information about the Bf-blender-cvs mailing list