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 | |
| 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')
| -rw-r--r-- | source/blender/blenkernel/BKE_global.h | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 12 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 1b20fe92a0e..65b28b29e45 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -115,7 +115,6 @@ typedef struct Global { #define G_DEBUG (1 << 12) #define G_DOSCRIPTLINKS (1 << 13) -#define G_TEXTUREPAINT (1 << 16) /* #define G_NOFROZEN (1 << 17) also removed */ #define G_GREASEPENCIL (1 << 17) diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index e026ccdcec6..ca21345e37f 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -197,9 +197,9 @@ Brush **current_brush_source(Scene *sce) return &sce->toolsettings->vpaint->brush; else if(ob->mode & OB_MODE_WEIGHT_PAINT) return &sce->toolsettings->wpaint->brush; + else if(ob->mode & OB_MODE_TEXTURE_PAINT) + return &sce->toolsettings->imapaint.brush; } - else if(G.f & G_TEXTUREPAINT) - return &sce->toolsettings->imapaint.brush; return NULL; } 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"; } diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 4081729ec5e..f47a44aff03 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -32,6 +32,6 @@ int paint_facesel_test(Object *ob) { - return (G.f&G_FACESELECT) && ((G.f & G_TEXTUREPAINT) || (ob && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT)))); + return (G.f&G_FACESELECT) && (ob && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))); } |