[Bf-blender-cvs] [dc86b7a4b5c] master: Remove remaining qtcodecdata

Aaron Carlisle noreply at git.blender.org
Fri Sep 22 23:14:14 CEST 2017


Commit: dc86b7a4b5c61a4a6e195351961181b74fc15446
Author: Aaron Carlisle
Date:   Fri Sep 22 17:13:46 2017 -0400
Branches: master
https://developer.blender.org/rBdc86b7a4b5c61a4a6e195351961181b74fc15446

Remove remaining qtcodecdata

This fixes a mistake in rBefd5e3c25401b43cbd7f909418835bb570db1ab3

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

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

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index f1a6b244344..5b809386267 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -383,12 +383,6 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
 			sce_copy->r.avicodecdata->lpParms = MEM_dupallocN(sce_copy->r.avicodecdata->lpParms);
 		}
 
-		/* make a private copy of the qtcodecdata */
-		if (sce->r.qtcodecdata) {
-			sce_copy->r.qtcodecdata = MEM_dupallocN(sce->r.qtcodecdata);
-			sce_copy->r.qtcodecdata->cdParms = MEM_dupallocN(sce_copy->r.qtcodecdata->cdParms);
-		}
-
 		if (sce->r.ffcodecdata.properties) { /* intentionally check scen not sce. */
 			sce_copy->r.ffcodecdata.properties = IDP_CopyProperty(sce->r.ffcodecdata.properties);
 		}



More information about the Bf-blender-cvs mailing list