[Bf-blender-cvs] [57c64a5] soc-2013-paint: Fix silly mistake.
Antony Riakiotakis
noreply at git.blender.org
Sat May 10 23:11:56 CEST 2014
Commit: 57c64a59266c757c0424b19191c5585c58ab687c
Author: Antony Riakiotakis
Date: Sun May 11 00:11:47 2014 +0300
https://developer.blender.org/rB57c64a59266c757c0424b19191c5585c58ab687c
Fix silly mistake.
===================================================================
M source/blender/editors/sculpt_paint/paint_curve.c
M source/blender/editors/transform/transform_generics.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c
index 2ce52eb..2062576 100644
--- a/source/blender/editors/sculpt_paint/paint_curve.c
+++ b/source/blender/editors/sculpt_paint/paint_curve.c
@@ -56,7 +56,7 @@ int paintcurve_poll(bContext *C)
RegionView3D *rv3d = CTX_wm_region_view3d(C);
SpaceImage *sima;
- if (rv3d && !ob && (ob->mode & OB_MODE_ALL_PAINT))
+ if (rv3d && !(ob && (ob->mode & OB_MODE_ALL_PAINT)))
return false;
sima = CTX_wm_space_image(C);
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 5b041b9..65ee81c 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1241,7 +1241,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
t->options |= CTX_MASK;
}
else if (sima->mode == SI_MODE_PAINT) {
- Paint *p = &sce->toolsettings->imapaint;
+ Paint *p = &sce->toolsettings->imapaint.paint;
if (p->brush && (p->brush->flag & BRUSH_CURVE)) {
t->options |= CTX_PAINT_CURVE;
t->around = V3D_CENTER;
More information about the Bf-blender-cvs
mailing list