Revision: 41443
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41443
Author: psy-fi
Date: 2011-11-01 14:55:23 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
smart stitching
===================
*Avoid hang when determining static island if redoing stitch.
*Remove leftover loading stuff from onion.
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
Modified:
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
===================================================================
---
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
2011-11-01 14:51:44 UTC (rev 41442)
+++
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
2011-11-01 14:55:23 UTC (rev 41443)
@@ -11510,7 +11510,7 @@
// same as dots
if (brush->rate == 0)
- brush->rate= 0.1f;
+ brush->rate = 0.1f;
/* New Settings */
if (main->versionfile < 252 || (main->versionfile ==
252 && main->subversionfile < 5)) {
@@ -11757,6 +11757,7 @@
if (main->versionfile < 256 || (main->versionfile == 256 &&
main->subversionfile <3)){
bScreen *sc;
+ Brush *brush;
Object *ob;
ParticleSettings *part;
Material *mat;
@@ -11789,6 +11790,11 @@
}
}
+ for (brush= main->brush.first; brush; brush= brush->id.next) {
+ if(brush->height == 0)
+ brush->height= 0.4f;
+ }
+
/* replace 'rim material' option for in offset*/
for(ob = main->object.first; ob; ob = ob->id.next) {
ModifierData *md;
Modified:
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
2011-11-01 14:51:44 UTC (rev 41442)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
2011-11-01 14:55:23 UTC (rev 41443)
@@ -2511,6 +2511,10 @@
return 0;
}
+ /* Entirely possible if redoing last operator that static island is
bigger than total number of islands.
+ * This ensures we get no hang in the island checking code in
stitch_process_data. */
+ stitch_state->static_island %= stitch_state->elementMap->totalIslands;
+
/* Count 'unique' uvs */
for(i = 0; i < stitch_state->elementMap->totalUVs; i++){
if(stitch_state->elementMap->buf[i].separate){
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
