diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 05:25:53 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 05:25:53 +0400 |
| commit | ebf1c5faca86286aa90ab5ab9fc4d3ddb1f51cdf (patch) | |
| tree | 1e457366adcd664233760e5e17b20aa6c3f8e4a2 /source/blender/blenkernel/intern/context.c | |
| parent | db1cab0f3a75562eebf5aea93753e77582a4c3e4 (diff) | |
2.5/Texture paint
* Made texture paint object-localized too.
Note for Brecht: gpu_draw.c had three uses of G_TEXTUREPAINT that I was not able to cleanly fix, so commented out for now. Can you take a look and see what should be done here?
Diffstat (limited to 'source/blender/blenkernel/intern/context.c')
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 3210206e16d..f8374be68bd 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -686,11 +686,13 @@ char *CTX_data_mode_string(const bContext *C) else { Object *ob = CTX_data_active_object(C); - if(ob && (ob->flag & OB_POSEMODE)) return "posemode"; - else if (ob && ob->mode & OB_MODE_SCULPT) return "sculpt_mode"; - else if (ob && ob->mode & OB_MODE_WEIGHT_PAINT) return "weightpaint"; - else if (ob && ob->mode & OB_MODE_VERTEX_PAINT) return "vertexpaint"; - else if (G.f & G_TEXTUREPAINT) return "texturepaint"; + if(ob) { + if(ob->flag & OB_POSEMODE) return "posemode"; + else if(ob->mode & OB_MODE_SCULPT) return "sculpt_mode"; + else if(ob->mode & OB_MODE_WEIGHT_PAINT) return "weightpaint"; + else if(ob->mode & OB_MODE_VERTEX_PAINT) return "vertexpaint"; + else if(ob->mode & OB_MODE_TEXTURE_PAINT) return "texturepaint"; + } else if(G.f & G_PARTICLEEDIT) return "particlemode"; } |