Revision: 48871
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48871
Author: psy-fi
Date: 2012-07-12 18:43:07 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Overlay for texpaint
=====================
* add an extra mode for mapping, solves some overlay issues.
Modified Paths:
--------------
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_texture_types.h
Modified:
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c
===================================================================
---
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c
2012-07-12 17:34:13 UTC (rev 48870)
+++
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c
2012-07-12 18:43:07 UTC (rev 48871)
@@ -131,13 +131,15 @@
GLubyte *buffer = NULL;
GLubyte *curve_buffer = NULL;
- char do_tiled = (br->mtex.brush_map_mode == MTEX_MAP_MODE_TILED);
+ char do_tiled_texpaint = (br->mtex.brush_map_mode ==
MTEX_MAP_MODE_TILED_TEXPAINT);
+ char do_tiled = (br->mtex.brush_map_mode == MTEX_MAP_MODE_TILED) ||
do_tiled_texpaint;
+
int size;
int curve_size;
int j;
int refresh, refresh_curve;
- if (br->mtex.brush_map_mode == MTEX_MAP_MODE_TILED && !br->mtex.tex)
return 0;
+ if (do_tiled && !br->mtex.tex) return 0;
refresh =
!overlay_texture ||
@@ -241,8 +243,10 @@
x = (float)i / size;
y = (float)j / size;
- x -= 0.5f;
- y -= 0.5f;
+ if(!do_tiled_texpaint) {
+ x -= 0.5f;
+ y -= 0.5f;
+ }
if (do_tiled) {
x *= vc->ar->winx / radius;
@@ -494,7 +498,7 @@
/* check for overlay mode */
if (!(brush->flag & BRUSH_TEXTURE_OVERLAY) ||
- !(ELEM(brush->mtex.brush_map_mode, MTEX_MAP_MODE_VIEW,
MTEX_MAP_MODE_TILED)) ||
+ !(ELEM3(brush->mtex.brush_map_mode, MTEX_MAP_MODE_VIEW,
MTEX_MAP_MODE_TILED, MTEX_MAP_MODE_TILED_TEXPAINT)) ||
(brush->flag & BRUSH_FIXED_TEX && in_uv_editor))
{
return;
@@ -675,7 +679,7 @@
in_uv_editor = get_imapaint_zoom(C, &zoomx, &zoomy);
if(CTX_data_mode_enum(C) == CTX_MODE_PAINT_TEXTURE) {
- brush->mtex.brush_map_mode = MTEX_MAP_MODE_TILED;
+ brush->mtex.brush_map_mode = MTEX_MAP_MODE_TILED_TEXPAINT;
if((brush->flag & BRUSH_RAKE) || (brush->flag &
BRUSH_RANDOM_ROTATION))
brush->mtex.brush_map_mode = MTEX_MAP_MODE_VIEW;
Modified:
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_texture_types.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/makesdna/DNA_texture_types.h
2012-07-12 17:34:13 UTC (rev 48870)
+++ branches/soc-2012-bratwurst/source/blender/makesdna/DNA_texture_types.h
2012-07-12 18:43:07 UTC (rev 48871)
@@ -491,10 +491,11 @@
#define MTEX_LIN_LIGHT 16
/* brush_map_mode */
-#define MTEX_MAP_MODE_VIEW 0
-#define MTEX_MAP_MODE_TILED 1
-#define MTEX_MAP_MODE_3D 2
-#define MTEX_MAP_MODE_AREA 3
+#define MTEX_MAP_MODE_VIEW 0
+#define MTEX_MAP_MODE_TILED 1
+#define MTEX_MAP_MODE_3D 2
+#define MTEX_MAP_MODE_AREA 3
+#define MTEX_MAP_MODE_TILED_TEXPAINT 4
/* **************** EnvMap ********************* */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
