Revision: 23160
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23160
Author: imbusy
Date: 2009-09-12 22:28:03 +0200 (Sat, 12 Sep 2009)
Log Message:
-----------
merge fix
Modified Paths:
--------------
branches/soc-2009-imbusy/source/blender/blenkernel/BKE_paint.h
Modified: branches/soc-2009-imbusy/source/blender/blenkernel/BKE_paint.h
===================================================================
--- branches/soc-2009-imbusy/source/blender/blenkernel/BKE_paint.h
2009-09-12 20:18:54 UTC (rev 23159)
+++ branches/soc-2009-imbusy/source/blender/blenkernel/BKE_paint.h
2009-09-12 20:28:03 UTC (rev 23160)
@@ -88,6 +88,8 @@
struct SculptStroke *stroke;
struct StrokeCache *cache;
+
+ struct GPUDrawObject *drawobject;
} SculptSession;
void free_sculptsession(SculptSession **);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
