[Bf-blender-cvs] [89572e2] vertex_paint_pbvh: Merge branch 'master' into vertex_paint_pbvh

[Campbell Barton]

Commit: 89572e277d8389db48a781cedf5c6fe51d10f4ef
Author: Campbell Barton
Date:   Tue Mar 24 01:38:01 2015 +1100
Branches: vertex_paint_pbvh
https://developer.blender.org/rB89572e277d8389db48a781cedf5c6fe51d10f4ef

Merge branch 'master' into vertex_paint_pbvh

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



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

diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 26ec645,ea046b7..b6e1246
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -4666,8 -4649,12 +4667,12 @@@ void sculpt_dynamic_topology_disable(bC
  static int sculpt_dynamic_topology_toggle_exec(bContext *C, wmOperator *UNUSED(op))
  {
  	Object *ob = CTX_data_active_object(C);
 -	SculptSession *ss = ob->sculpt;
 +	SculptSession *ss = ob->paint->sculpt;
  
+ 	if (!G.background && !GPU_vertex_buffer_support()) {
+ 		return OPERATOR_CANCELLED;
+ 	}
+ 
  	if (ss->bm) {
  		sculpt_undo_push_begin("Dynamic topology disable");
  		sculpt_undo_push_node(ob, NULL, SCULPT_UNDO_DYNTOPO_END);
@@@ -4718,8 -4717,12 +4735,12 @@@ static int sculpt_dynamic_topology_togg
  {
  	Object *ob = CTX_data_active_object(C);
  	Mesh *me = ob->data;
 -	SculptSession *ss = ob->sculpt;
 +	SculptSession *ss = ob->paint->sculpt;
  
+ 	if (!GPU_vertex_buffer_support()) {
+ 		dyntopo_warning_popup(C, op->type, false, false, true);
+ 	}
+ 
  	if (!ss->bm) {
  		Scene *scene = CTX_data_scene(C);
  		ModifierData *md;