2.5: Painting

Various fixes for painting, sculpting and particle edit, still
much to be done...

* Move RNA paint and sculpt structs into rna_sculpt_paint.c,
* Added Particle Edit RNA.
* Some tweaks to existing Paint RNA.

* Put texture paint and particle edit object in context.

* Fix some errors in the brush layout, properly doing None
  checks, fixing some wrong property identifiers.
* Added tool enum for texture paint and particle edit in panels.

* Allow editing brush textures in the texture buttons, still with
  a stupid toggle, ideas for how to make the connection better are
  welcome.

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c
index 89a6d659d67..1564fcb169b 100644
--- a/source/blender/editors/space_view3d/view3d_toolbar.c
+++ b/source/blender/editors/space_view3d/view3d_toolbar.c
@@ -175,12 +175,12 @@ char *view3d_context_string(const bContext *C)
 	else {
 		Object *ob = CTX_data_active_object(C);
 		
-		if(ob && (ob->flag & OB_POSEMODE)) return "posemode";
-		else if (G.f & G_SCULPTMODE)  return "sculptmode";
-		else if (G.f & G_WEIGHTPAINT) return "weightpaint";
-		else if (G.f & G_VERTEXPAINT) return "vertexpaint";
-		else if (G.f & G_TEXTUREPAINT) return "texturepaint";
-		else if(G.f & G_PARTICLEEDIT) return "particlemode";
+		if(ob && (ob->flag & OB_POSEMODE)) return "pose_mode";
+		else if (G.f & G_SCULPTMODE)  return "sculpt_mode";
+		else if (G.f & G_WEIGHTPAINT) return "weight_paint";
+		else if (G.f & G_VERTEXPAINT) return "vertex_paint";
+		else if (G.f & G_TEXTUREPAINT) return "texture_paint";
+		else if(G.f & G_PARTICLEEDIT) return "particle_mode";
 	}
 	
 	return "objectmode";