[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48876] branches/soc-2012-bratwurst/source /blender/makesrna/intern/rna_brush.c: More cleanup of brush modes for texture paint mode
Antony Riakiotakis
kalast at gmail.com
Thu Jul 12 21:56:35 CEST 2012
Revision: 48876
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48876
Author: psy-fi
Date: 2012-07-12 19:56:34 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
More cleanup of brush modes for texture paint mode
Modified Paths:
--------------
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c
Modified: branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c 2012-07-12 19:48:16 UTC (rev 48875)
+++ branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c 2012-07-12 19:56:34 UTC (rev 48876)
@@ -145,9 +145,10 @@
static int rna_PaintCapabilities_has_overlay_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
- return ELEM(br->mtex.brush_map_mode,
+ return ELEM3(br->mtex.brush_map_mode,
MTEX_MAP_MODE_VIEW,
- MTEX_MAP_MODE_TILED);
+ MTEX_MAP_MODE_TILED,
+ MTEX_MAP_MODE_TILED_TEXPAINT);
}
static int rna_PaintCapabilities_has_persistence_get(PointerRNA *ptr)
@@ -172,9 +173,10 @@
static int rna_PaintCapabilities_has_random_texture_angle_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
- return (ELEM(br->mtex.brush_map_mode,
+ return (ELEM3(br->mtex.brush_map_mode,
MTEX_MAP_MODE_VIEW,
- MTEX_MAP_MODE_AREA) &&
+ MTEX_MAP_MODE_AREA,
+ MTEX_MAP_MODE_TILED_TEXPAINT) &&
!(br->flag & BRUSH_ANCHORED) &&
!ELEM4(br->sculpt_tool,
SCULPT_TOOL_GRAB, SCULPT_TOOL_ROTATE,
@@ -235,18 +237,21 @@
static int rna_PaintCapabilities_has_texture_angle_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
- return ELEM3(br->mtex.brush_map_mode,
+ return ELEM4(br->mtex.brush_map_mode,
MTEX_MAP_MODE_VIEW,
MTEX_MAP_MODE_AREA,
- MTEX_MAP_MODE_TILED);
+ MTEX_MAP_MODE_TILED,
+ MTEX_MAP_MODE_TILED_TEXPAINT);
}
static int rna_PaintCapabilities_has_texture_angle_source_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
- return ELEM(br->mtex.brush_map_mode,
+ return ELEM4(br->mtex.brush_map_mode,
MTEX_MAP_MODE_VIEW,
- MTEX_MAP_MODE_AREA);
+ MTEX_MAP_MODE_AREA,
+ MTEX_MAP_MODE_TILED,
+ MTEX_MAP_MODE_TILED_TEXPAINT);
}
static PointerRNA rna_Brush_paint_capabilities_get(PointerRNA *ptr)
More information about the Bf-blender-cvs
mailing list