forked from bartvdbraak/blender
Fix some names, and move overlay flag to overlay_flags.
This commit is contained in:
parent
51cb077f16
commit
c1276960e8
@ -733,7 +733,7 @@ class IMAGE_PT_tools_brush_texture(BrushButtonsPanel, Panel):
|
||||
col.label(text="Overlay:")
|
||||
|
||||
row = col.row()
|
||||
if brush.use_texture_overlay:
|
||||
if brush.use_primary_overlay:
|
||||
row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF')
|
||||
else:
|
||||
row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON')
|
||||
|
@ -766,7 +766,7 @@ class VIEW3D_PT_tools_brush_texture(Panel, View3DPaintPanel):
|
||||
|
||||
row = col.row()
|
||||
if tex_slot.map_mode != 'STENCIL':
|
||||
if brush.use_texture_overlay:
|
||||
if brush.use_primary_overlay:
|
||||
row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_OFF')
|
||||
else:
|
||||
row.prop(brush, "use_primary_overlay", toggle=True, text="", icon='RESTRICT_VIEW_ON')
|
||||
|
@ -42,7 +42,7 @@ extern "C" {
|
||||
* and keep comment above the defines.
|
||||
* Use STRINGIFY() rather than defining with quotes */
|
||||
#define BLENDER_VERSION 266
|
||||
#define BLENDER_SUBVERSION 5
|
||||
#define BLENDER_SUBVERSION 6
|
||||
|
||||
/* 262 was the last editmesh release but it has compatibility code for bmesh data */
|
||||
#define BLENDER_MINVERSION 262
|
||||
|
@ -111,6 +111,9 @@ static void brush_defaults(Brush *brush)
|
||||
|
||||
brush->texture_sample_bias = 0; /* value to added to texture samples */
|
||||
brush->texture_overlay_alpha = 33;
|
||||
brush->mask_overlay_alpha = 33;
|
||||
brush->cursor_overlay_alpha = 33;
|
||||
brush->overlay_flags = 0;
|
||||
|
||||
/* brush appearance */
|
||||
|
||||
|
@ -9266,6 +9266,18 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
|
||||
}
|
||||
}
|
||||
|
||||
if (!MAIN_VERSION_ATLEAST(main, 266, 6)) {
|
||||
Brush *brush;
|
||||
#define BRUSH_TEXTURE_OVERLAY (1 << 21)
|
||||
|
||||
for (brush = main->brush.first; brush; brush = brush->id.next) {
|
||||
brush->overlay_flags = 0;
|
||||
if (brush->flag & BRUSH_TEXTURE_OVERLAY)
|
||||
brush->overlay_flags |= (BRUSH_OVERLAY_PRIMARY | BRUSH_OVERLAY_CURSOR);
|
||||
}
|
||||
#undef BRUSH_TEXTURE_OVERLAY
|
||||
}
|
||||
|
||||
if (main->versionfile < 267) {
|
||||
//if(!DNA_struct_elem_find(fd->filesdna, "Brush", "int", "stencil_pos")) {
|
||||
Brush *brush;
|
||||
|
Loading…
Reference in New Issue
Block a user