svn merge ^/trunk/blender -r43220:43278 --accept postpone

5 files changed, 1 insertions, 186 deletions

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 494effc8f45..631dfce297a 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -596,132 +596,6 @@ void OBJECT_OT_posemode_toggle(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-/* *********************** */
-
-#if 0
-// XXX should be in view3d?
-
-/* context: ob = lamp */
-/* code should be replaced with proper (custom) transform handles for lamp properties */
-static void spot_interactive(Object *ob, int mode)
-{
-	Lamp *la= ob->data;
-	float transfac, dx, dy, ratio, origval;
-	int keep_running= 1, center2d[2];
-	int mval[2], mvalo[2];
-	
-//	getmouseco_areawin(mval);
-//	getmouseco_areawin(mvalo);
-	
-	project_int(ob->obmat[3], center2d);
-	if( center2d[0] > 100000 ) {		/* behind camera */
-//		center2d[0]= curarea->winx/2;
-//		center2d[1]= curarea->winy/2;
-	}
-
-//	helpline(mval, center2d);
-	
-	/* ratio is like scaling */
-	dx = (float)(center2d[0] - mval[0]);
-	dy = (float)(center2d[1] - mval[1]);
-	transfac = (float)sqrt( dx*dx + dy*dy);
-	if(transfac==0.0f) transfac= 1.0f;
-	
-	if(mode==1)	
-		origval= la->spotsize;
-	else if(mode==2)	
-		origval= la->dist;
-	else if(mode==3)	
-		origval= la->clipsta;
-	else	
-		origval= la->clipend;
-	
-	while (keep_running>0) {
-		
-//		getmouseco_areawin(mval);
-		
-		/* essential for idling subloop */
-		if(mval[0]==mvalo[0] && mval[1]==mvalo[1]) {
-			PIL_sleep_ms(2);
-		}
-		else {
-			char str[32];
-			
-			dx = (float)(center2d[0] - mval[0]);
-			dy = (float)(center2d[1] - mval[1]);
-			ratio = (float)(sqrt( dx*dx + dy*dy))/transfac;
-			
-			/* do the trick */
-			
-			if(mode==1) {	/* spot */
-				la->spotsize = ratio*origval;
-				CLAMP(la->spotsize, 1.0f, 180.0f);
-				sprintf(str, "Spot size %.2f\n", la->spotsize);
-			}
-			else if(mode==2) {	/* dist */
-				la->dist = ratio*origval;
-				CLAMP(la->dist, 0.01f, 5000.0f);
-				sprintf(str, "Distance %.2f\n", la->dist);
-			}
-			else if(mode==3) {	/* sta */
-				la->clipsta = ratio*origval;
-				CLAMP(la->clipsta, 0.001f, 5000.0f);
-				sprintf(str, "Distance %.2f\n", la->clipsta);
-			}
-			else if(mode==4) {	/* end */
-				la->clipend = ratio*origval;
-				CLAMP(la->clipend, 0.1f, 5000.0f);
-				sprintf(str, "Clip End %.2f\n", la->clipend);
-			}
-
-			/* cleanup */
-			mvalo[0]= mval[0];
-			mvalo[1]= mval[1];
-			
-			/* handle shaded mode */
-// XXX			shade_buttons_change_3d();
-
-			/* DRAW */	
-			headerprint(str);
-			force_draw_plus(SPACE_BUTS, 0);
-
-//			helpline(mval, center2d);
-		}
-		
-		while( qtest() ) {
-			short val;
-			unsigned short event= extern_qread(&val);
-			
-			switch (event){
-				case ESCKEY:
-				case RIGHTMOUSE:
-					keep_running= 0;
-					break;
-				case LEFTMOUSE:
-				case SPACEKEY:
-				case PADENTER:
-				case RETKEY:
-					if(val)
-						keep_running= -1;
-					break;
-			}
-		}
-	}
-
-	if(keep_running==0) {
-		if(mode==1)	
-			la->spotsize= origval;
-		else if(mode==2)	
-			la->dist= origval;
-		else if(mode==3)	
-			la->clipsta= origval;
-		else	
-			la->clipend= origval;
-	}
-
-}
-#endif
-
 static void copymenu_properties(Scene *scene, View3D *v3d, Object *ob)
 {	
 //XXX no longer used - to be removed - replaced by game_properties_copy_exec
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index bb7d2e1bc7c..6120891be88 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -103,7 +103,6 @@ void OBJECT_OT_select_by_layer(struct wmOperatorType *ot);
 void OBJECT_OT_select_linked(struct wmOperatorType *ot);
 void OBJECT_OT_select_grouped(struct wmOperatorType *ot);
 void OBJECT_OT_select_mirror(struct wmOperatorType *ot);
-void OBJECT_OT_select_name(struct wmOperatorType *ot);
 void OBJECT_OT_select_same_group(struct wmOperatorType *ot);
 
 /* object_add.c */
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 054aafe5a99..3daffe415d1 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -103,7 +103,6 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_select_linked);
 	WM_operatortype_append(OBJECT_OT_select_grouped);
 	WM_operatortype_append(OBJECT_OT_select_mirror);
-	WM_operatortype_append(OBJECT_OT_select_name); /* XXX - weak, not compat with linked objects */
 
 	WM_operatortype_append(GROUP_OT_create);
 	WM_operatortype_append(GROUP_OT_objects_remove);
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index c4d33b74574..b48b2e8718d 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -939,63 +939,6 @@ void OBJECT_OT_select_mirror(wmOperatorType *ot)
 }
 
 
-static int object_select_name_exec(bContext *C, wmOperator *op)
-{
-	char *name= RNA_string_get_alloc(op->ptr, "name", NULL, 0);
-	short extend= RNA_boolean_get(op->ptr, "extend");
-	short changed = 0;
-
-	if(!extend) {
-		CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
-			if(base->flag & SELECT) {
-				ED_base_object_select(base, BA_DESELECT);
-				changed= 1;
-			}
-		}
-		CTX_DATA_END;
-	}
-
-	CTX_DATA_BEGIN(C, Base*, base, selectable_bases) {
-		/* this is a bit dodjy, there should only be ONE object with this name, but library objects can mess this up */
-		if(strcmp(name, base->object->id.name+2)==0) {
-			ED_base_object_activate(C, base);
-			ED_base_object_select(base, BA_SELECT);
-			changed= 1;
-		}
-	}
-	CTX_DATA_END;
-
-	MEM_freeN(name);
-
-	/* undo? */
-	if(changed) {
-		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
-	}
-}
-
-void OBJECT_OT_select_name(wmOperatorType *ot)
-{
-
-	/* identifiers */
-	ot->name= "Select Name";
-	ot->description = "Select an object with this name";
-	ot->idname= "OBJECT_OT_select_name";
-
-	/* api callbacks */
-	ot->exec= object_select_name_exec;
-	ot->poll= objects_selectable_poll;
-
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-
-	RNA_def_string(ot->srna, "name", "", 0, "Name", "Object name to select");
-	RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first");
-}
-
 /**************************** Select Random ****************************/
 
 static int object_select_random_exec(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index c5afc740c24..6b2847b6182 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -2066,7 +2066,7 @@ static int vertex_group_poll(bContext *C)
 	return (ob && !ob->id.lib && OB_TYPE_SUPPORT_VGROUP(ob->type) && data && !data->lib);
 }
 
-static int vertex_group_poll_edit(bContext *C)
+static int UNUSED_FUNCTION(vertex_group_poll_edit)(bContext *C)
 {
 	Object *ob= ED_object_context(C);
 	ID *data= (ob)? ob->data: NULL;