[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38801] branches/soc-2011-onion/source/ blender/editors/uvedit/uvedit_ops.c: do live unwrap and hide properties in GUI

Antony Riakiotakis kalast at gmail.com
Fri Jul 29 00:15:38 CEST 2011


Revision: 38801
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38801
Author:   psy-fi
Date:     2011-07-28 22:15:37 +0000 (Thu, 28 Jul 2011)
Log Message:
-----------
do live unwrap and hide properties in GUI

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c

Modified: branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c	2011-07-28 21:28:07 UTC (rev 38800)
+++ branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c	2011-07-28 22:15:37 UTC (rev 38801)
@@ -4396,18 +4396,15 @@
 			(*(&hit.efa->e1 + hit.edge))->seam = 1;
 		}
 	}
-	/*
-	 * May be needed for synch selection
-	if(	(vc.scene->toolsettings->edge_mode_live_unwrap) &&
-				(vc.scene->toolsettings->edge_mode == EDGE_MODE_TAG_SEAM) &&
-				(CustomData_has_layer(&em->fdata, CD_MTFACE))
-			) {
-				ED_unwrap_lscm(vc.scene, vc.obedit, FALSE);
-			}
-	 */
+//(scene->toolsettings->uv_flag & UV_SYNC_SELECTION) &&
+	if((scene->toolsettings->edge_mode_live_unwrap) && (CustomData_has_layer(&em->fdata, CD_MTFACE))){
+		ED_unwrap_lscm(scene, ob, FALSE);
+	}else{
+		uvedit_live_unwrap_update(sima, scene, ob);
+	}
+
 	BKE_mesh_end_editmesh((Mesh*)ob->data, em);
 
-	uvedit_live_unwrap_update(sima, scene, ob);
 	DAG_id_tag_update(ob->data, 0);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
 
@@ -4438,7 +4435,7 @@
 	/* api callbacks */
 	ot->invoke= mark_seam_uv_invoke;
 	ot->exec= mark_seam_uv_exec;
-	ot->poll= ED_operator_uvedit;
+	ot->poll= ED_operator_image_active;
 
 	RNA_def_boolean(ot->srna, "selection", 0, "Selection", "Mark edge seams for selection");
 	RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX,




More information about the Bf-blender-cvs mailing list