[Bf-blender-cvs] [65a108c] missing-libs: Merge branch 'master' into missing-libs

Bastien Montagne noreply at git.blender.org
Thu Sep 3 16:16:37 CEST 2015


Commit: 65a108cf35ff0aa7e08624105e12754438c6d4d6
Author: Bastien Montagne
Date:   Thu Sep 3 16:16:26 2015 +0200
Branches: missing-libs
https://developer.blender.org/rB65a108cf35ff0aa7e08624105e12754438c6d4d6

Merge branch 'master' into missing-libs

===================================================================



===================================================================

diff --cc source/blender/blenkernel/BKE_brush.h
index ca2aa74,aff3fb0..bb3ad0e
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@@ -40,8 -40,8 +40,9 @@@ void BKE_brush_system_init(void)
  void BKE_brush_system_exit(void);
  
  /* datablock functions */
 +void BKE_brush_init(struct Brush *brush);
- struct Brush *BKE_brush_add(struct Main *bmain, const char *name);
+ struct Brush *BKE_brush_add(struct Main *bmain, const char *name, short ob_mode);
+ struct Brush *BKE_brush_first_search(struct Main *bmain, short ob_mode);
  struct Brush *BKE_brush_copy(struct Brush *brush);
  void BKE_brush_make_local(struct Brush *brush);
  void BKE_brush_free(struct Brush *brush);
diff --cc source/blender/blenkernel/intern/brush.c
index d4c9e9b,e0ffd83..d4c65af
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@@ -144,16 -146,8 +144,18 @@@ void BKE_brush_init(Brush *brush
  
  	/* the default alpha falloff curve */
  	BKE_brush_curve_preset(brush, CURVE_PRESET_SMOOTH);
 +}
 +
- Brush *BKE_brush_add(Main *bmain, const char *name)
++Brush *BKE_brush_add(Main *bmain, const char *name, short ob_mode)
 +{
 +	Brush *brush;
 +
 +	brush = BKE_libblock_alloc(bmain, ID_BR, name);
 +
 +	BKE_brush_init(brush);
 +
++	brush->ob_mode = ob_mode;
+ 
  	return brush;
  }




More information about the Bf-blender-cvs mailing list