[Bf-blender-cvs] [a9c3ddc] gooseberry: Merge branch 'wiggly-widgets' into gooseberry

[Antony Riakiotakis]

Commit: a9c3ddc617e9c40a17327df507cff765246b1b30
Author: Antony Riakiotakis
Date:   Thu Feb 5 12:38:50 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBa9c3ddc617e9c40a17327df507cff765246b1b30

Merge branch 'wiggly-widgets' into gooseberry

Conflicts:
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/object/object_intern.h
	source/blender/editors/object/object_ops.c
	source/blender/editors/space_sequencer/sequencer_draw.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/makesrna/intern/rna_object.c

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



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

diff --cc source/blender/editors/space_sequencer/sequencer_draw.c
index d8ff695,69efffe..1644efb
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@@ -1541,6 -1522,13 +1541,13 @@@ void draw_timeline_seq(const bContext *
  	// NOTE: the gridlines are currently spaced every 25 frames, which is only fine for 25 fps, but maybe not for 30...
  	UI_view2d_constant_grid_draw(v2d);
  
+ 	/*
+ 	if (sseq->draw_flag & SEQ_DRAW_BACKDROP) {
+ 		draw_image_seq(C, scene, ar, sseq, scene->r.cfra, 0, false, true);
+ 		UI_view2d_view_ortho(v2d);
+ 	}
+ 	*/
 -		
++
  	ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
  	
  	seq_draw_sfra_efra(scene, v2d);
diff --cc source/blender/editors/space_view3d/view3d_draw.c
index eca4785,6e985cf..66e15c1
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -3697,7 -3607,8 +3697,6 @@@ void view3d_main_area_draw(const bConte
  #endif
  		if (G.debug & G_DEBUG_SIMDATA)
  			draw_sim_debug_data(scene, v3d, ar);
--		
 -		ED_region_pixelspace(ar);
  	}
  
  	/* draw viewport using external renderer */