[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54240] branches/soc-2008-mxcurioni/source /blender/blenkernel/intern/scene.c: Fix for a bug that Freestyle settings of a scene are reset when copying the scene .

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Thu Jan 31 21:42:26 CET 2013


Revision: 54240
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54240
Author:   kjym3
Date:     2013-01-31 20:42:25 +0000 (Thu, 31 Jan 2013)
Log Message:
-----------
Fix for a bug that Freestyle settings of a scene are reset when copying the scene.
Problem report by IRIE Shinsuke, many thanks!

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c	2013-01-31 20:41:47 UTC (rev 54239)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c	2013-01-31 20:42:25 UTC (rev 54240)
@@ -217,11 +217,7 @@
 
 			new_srl = scen->r.layers.first;
 			for (srl = sce->r.layers.first; srl; srl = srl->next) {
-				if (type == SCE_COPY_FULL) {
-					FRS_copy_freestyle_config(&new_srl->freestyleConfig, &srl->freestyleConfig);
-				} else {
-					FRS_init_freestyle_config(&srl->freestyleConfig);
-				}
+				FRS_copy_freestyle_config(&new_srl->freestyleConfig, &srl->freestyleConfig);
 				new_srl = new_srl->next;
 			}
 		}




More information about the Bf-blender-cvs mailing list