tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix some names, and move overlay flag to overlay_flags.

This commit is contained in:
Antony Riakiotakis 2013-04-16 15:59:02 +00:00
parent 51cb077f16
commit c1276960e8
5 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_image.py
View File

@ -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')

2
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@ -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')

2
source/blender/blenkernel/BKE_blender.h
View File

@ -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

3
source/blender/blenkernel/intern/brush.c
View File

@ -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 */

12
source/blender/blenloader/intern/readfile.c
View File

@ -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;