Revision: 56095
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56095
Author: psy-fi
Date: 2013-04-16 15:59:02 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Fix some names, and move overlay flag to overlay_flags.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_image.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_image.py 2013-04-16
15:45:30 UTC (rev 56094)
+++ trunk/blender/release/scripts/startup/bl_ui/space_image.py 2013-04-16
15:59:02 UTC (rev 56095)
@@ -733,7 +733,7 @@
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')
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2013-04-16 15:45:30 UTC (rev 56094)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2013-04-16 15:59:02 UTC (rev 56095)
@@ -766,7 +766,7 @@
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')
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2013-04-16
15:45:30 UTC (rev 56094)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2013-04-16
15:59:02 UTC (rev 56095)
@@ -42,7 +42,7 @@
* 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
Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2013-04-16
15:45:30 UTC (rev 56094)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2013-04-16
15:59:02 UTC (rev 56095)
@@ -111,6 +111,9 @@
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 */
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-04-16
15:45:30 UTC (rev 56094)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-04-16
15:59:02 UTC (rev 56095)
@@ -9266,6 +9266,18 @@
}
}
+ 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
