[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16070] branches/harmonic-skeleton/source/ blender: Add missing stuff in new scene code to properly init skeletor params properly .

[Martin Poirier]

Revision: 16070
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16070
Author:   theeth
Date:     2008-08-12 21:56:03 +0200 (Tue, 12 Aug 2008)

Log Message:
-----------
Add missing stuff in new scene code to properly init skeletor params properly.

Add sanity check on file load to fix old files (won't be merged in trunk).

Modified Paths:
--------------
    branches/harmonic-skeleton/source/blender/blenkernel/intern/scene.c
    branches/harmonic-skeleton/source/blender/blenloader/intern/readfile.c

Modified: branches/harmonic-skeleton/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/harmonic-skeleton/source/blender/blenkernel/intern/scene.c	2008-08-12 16:57:38 UTC (rev 16069)
+++ branches/harmonic-skeleton/source/blender/blenkernel/intern/scene.c	2008-08-12 19:56:03 UTC (rev 16070)
@@ -252,6 +252,21 @@
 	sce->toolsettings->select_thresh= 0.01f;
 	sce->toolsettings->jointrilimit = 0.8f;
 
+	sce->toolsettings->skgen_resolution = 100;
+	sce->toolsettings->skgen_threshold_internal 	= 0.01f;
+	sce->toolsettings->skgen_threshold_external 	= 0.01f;
+	sce->toolsettings->skgen_angle_limit	 		= 45.0f;
+	sce->toolsettings->skgen_length_ratio			= 1.3f;
+	sce->toolsettings->skgen_length_limit			= 1.5f;
+	sce->toolsettings->skgen_correlation_limit		= 0.98f;
+	sce->toolsettings->skgen_symmetry_limit			= 0.1f;
+	sce->toolsettings->skgen_postpro = SKGEN_SMOOTH;
+	sce->toolsettings->skgen_postpro_passes = 1;
+	sce->toolsettings->skgen_options = SKGEN_FILTER_INTERNAL|SKGEN_FILTER_EXTERNAL|SKGEN_FILTER_SMART|SKGEN_HARMONIC|SKGEN_SUB_CORRELATION|SKGEN_STICK_TO_EMBEDDING;
+	sce->toolsettings->skgen_subdivisions[0] = SKGEN_SUB_CORRELATION;
+	sce->toolsettings->skgen_subdivisions[1] = SKGEN_SUB_LENGTH;
+	sce->toolsettings->skgen_subdivisions[2] = SKGEN_SUB_ANGLE;
+
 	pset= &sce->toolsettings->particle;
 	pset->flag= PE_KEEP_LENGTHS|PE_LOCK_FIRST|PE_DEFLECT_EMITTER;
 	pset->emitterdist= 0.25f;

Modified: branches/harmonic-skeleton/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/harmonic-skeleton/source/blender/blenloader/intern/readfile.c	2008-08-12 16:57:38 UTC (rev 16069)
+++ branches/harmonic-skeleton/source/blender/blenloader/intern/readfile.c	2008-08-12 19:56:03 UTC (rev 16070)
@@ -7343,6 +7343,24 @@
 			}
 		}
 	}
+	
+	/* sanity check for skgen
+	 * */
+	{
+		Scene *sce;
+		for(sce=main->scene.first; sce; sce = sce->id.next)
+		{
+			if (sce->toolsettings->skgen_subdivisions[0] == sce->toolsettings->skgen_subdivisions[1] ||
+				sce->toolsettings->skgen_subdivisions[0] == sce->toolsettings->skgen_subdivisions[2] ||
+				sce->toolsettings->skgen_subdivisions[1] == sce->toolsettings->skgen_subdivisions[2])
+			{
+					sce->toolsettings->skgen_subdivisions[0] = SKGEN_SUB_CORRELATION;
+					sce->toolsettings->skgen_subdivisions[1] = SKGEN_SUB_LENGTH;
+					sce->toolsettings->skgen_subdivisions[2] = SKGEN_SUB_ANGLE;
+			}
+		}
+	}
+	
 
 	if ((main->versionfile < 245) || (main->versionfile == 245 && main->subversionfile < 2)) {
 		Image *ima;