← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/editors/sculpt_paint/paint_ops.c

  • Committer: Reinhard Tartler
  • Date: 2014-05-31 01:50:05 UTC
  • mfrom: (14.2.27 sid)
  • Revision ID: siretart@tauware.de-20140531015005-ml6druahuj82nsav
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/sculpt_paint/paint_ops.c
313
313
 
314
314
static int brush_generic_tool_set(Main *bmain, Paint *paint, const int tool,
315
315
                                  const size_t tool_offset, const int ob_mode,
316
 
                                  const char *tool_name, int create_missing,
317
 
                                  int toggle)
 
316
                                  const char *tool_name, const bool create_missing,
 
317
                                  const bool toggle)
318
318
{
319
319
        Brush *brush, *brush_orig = BKE_paint_brush(paint);
320
320
 
350
350
        ToolSettings *toolsettings = CTX_data_tool_settings(C);
351
351
        Paint *paint = NULL;
352
352
        int tool, paint_mode = RNA_enum_get(op->ptr, "paint_mode");
353
 
        int create_missing = RNA_boolean_get(op->ptr, "create_missing");
354
 
        int toggle = RNA_boolean_get(op->ptr, "toggle");
 
353
        const bool create_missing = RNA_boolean_get(op->ptr, "create_missing");
 
354
        const bool toggle = RNA_boolean_get(op->ptr, "toggle");
355
355
        const char *tool_name = "Brush";
356
356
        size_t tool_offset;
357
357
 
613
613
        *scd->rot_target = scd->init_rot;
614
614
}
615
615
 
616
 
static int stencil_control_cancel(bContext *UNUSED(C), wmOperator *op)
 
616
static void stencil_control_cancel(bContext *UNUSED(C), wmOperator *op)
617
617
{
618
618
        StencilControlData *scd = op->customdata;
619
619
 
620
620
        stencil_restore(scd);
621
621
        MEM_freeN(op->customdata);
622
 
        return OPERATOR_CANCELLED;
623
622
}
624
623
 
625
624
static void stencil_control_calculate(StencilControlData *scd, const int mval[2])
987
986
 
988
987
        /* paint masking */
989
988
        WM_operatortype_append(PAINT_OT_mask_flood_fill);
 
989
        WM_operatortype_append(PAINT_OT_mask_lasso_gesture);
990
990
}
991
991
 
992
992
 
1149
1149
        kmi = WM_keymap_add_item(keymap, "PAINT_OT_mask_flood_fill", IKEY, KM_PRESS, KM_CTRL, 0);
1150
1150
        RNA_enum_set(kmi->ptr, "mode", PAINT_MASK_INVERT);
1151
1151
 
 
1152
        WM_keymap_add_item(keymap, "PAINT_OT_mask_lasso_gesture", LEFTMOUSE, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
 
1153
 
1152
1154
        /* Toggle dynamic topology */
1153
1155
        WM_keymap_add_item(keymap, "SCULPT_OT_dynamic_topology_toggle", DKEY, KM_PRESS, KM_CTRL, 0);
1154
1156
 
1175
1177
 
1176
1178
        ed_keymap_stencil(keymap);
1177
1179
 
1178
 
        keymap_brush_select(keymap, OB_MODE_SCULPT, SCULPT_TOOL_DRAW, DKEY, 0);
 
1180
        keymap_brush_select(keymap, OB_MODE_SCULPT, SCULPT_TOOL_DRAW, XKEY, 0);
1179
1181
        keymap_brush_select(keymap, OB_MODE_SCULPT, SCULPT_TOOL_SMOOTH, SKEY, 0);
1180
1182
        keymap_brush_select(keymap, OB_MODE_SCULPT, SCULPT_TOOL_PINCH, PKEY, 0);
1181
1183
        keymap_brush_select(keymap, OB_MODE_SCULPT, SCULPT_TOOL_INFLATE, IKEY, 0);