Commit: f6fc2f5991206d0bbf4d2087a1668be45f18119e
Author: Dalai Felinto
Date:   Tue Jul 29 17:48:21 2014 -0300
Branches: pie-menus
https://developer.blender.org/rBf6fc2f5991206d0bbf4d2087a1668be45f18119e

small cleanup against mater to avoid conflict when merge-testing with multiview

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

M       source/blender/makesdna/DNA_userdef_types.h

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

diff --git a/source/blender/makesdna/DNA_userdef_types.h 
b/source/blender/makesdna/DNA_userdef_types.h
index 7ea2770..1dcdbb3 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -853,7 +853,6 @@ typedef enum eImageDrawMethod {
        IMAGE_DRAW_METHOD_DRAWPIXELS = 3,
 } eImageDrawMethod;
 
-
 #ifdef __cplusplus
 }
 #endif

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to