[Bf-blender-cvs] [aae1162] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Antony Riakiotakis]

Commit: aae11629451a070c9e17cdb109b5ffabb4dc3684
Author: Antony Riakiotakis
Date:   Mon Nov 24 19:22:15 2014 +0100
Branches: wiggly-widgets
https://developer.blender.org/rBaae11629451a070c9e17cdb109b5ffabb4dc3684

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_ops.c

===================================================================



===================================================================

diff --cc source/blender/editors/space_view3d/view3d_edit.c
index e504050,20488e5..07b04e9
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@@ -4296,18 -4350,12 +4350,12 @@@ static int background_image_add_invoke(
  	}
  
  	bgpic = background_image_add(C);
+ 	bgpic->ima = ima;
  
- 	if (ima) {
- 		bgpic->ima = ima;
- 
- 		id_us_plus(&ima->id);
- 
- 		if (!(v3d->flag & V3D_DISPBGPICS))
- 			v3d->flag |= V3D_DISPBGPICS;
- 	}
- 
+ 	v3d->flag |= V3D_DISPBGPICS;
+ 	
  	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
 -	
 +
  	return OPERATOR_FINISHED;
  }
  
@@@ -4327,10 -4375,11 +4375,11 @@@ void VIEW3D_OT_background_image_add(wmO
  
  	/* flags */
  	ot->flag   = 0;
 -	
 +
  	/* properties */
  	RNA_def_string(ot->srna, "name", "Image", MAX_ID_NAME - 2, "Name", "Image name to assign");
- 	RNA_def_string(ot->srna, "filepath", "Path", FILE_MAX, "Filepath", "Path to image file");
+ 	WM_operator_properties_filesel(ot, FOLDERFILE | IMAGEFILE, FILE_SPECIAL, FILE_OPENFILE,
+ 	                               WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
  }
  
  
diff --cc source/blender/editors/space_view3d/view3d_ops.c
index 71c3256,5df3484..499a13c
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@@ -76,10 -77,10 +77,10 @@@ static int view3d_copybuffer_exec(bCont
  		BKE_copybuffer_tag_ID(&ob->id);
  	}
  	CTX_DATA_END;
- 
- 	BLI_make_file_string("/", str, BLI_temp_dir_base(), "copybuffer.blend");
+ 	
+ 	BLI_make_file_string("/", str, BKE_tempdir_base(), "copybuffer.blend");
  	BKE_copybuffer_save(str, op->reports);
 -	
 +
  	BKE_report(op->reports, RPT_INFO, "Copied selected objects to buffer");
  
  	return OPERATOR_FINISHED;