Commit: f2c4a24b8be828cd4081af1b6b35a03c478e2a30
Author: Antonio Vazquez
Date: Fri Jun 29 11:48:31 2018 +0200
Branches: temp-greasepencil-vfx
https://developer.blender.org/rBf2c4a24b8be828cd4081af1b6b35a03c478e2a30
Fix merge error
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c
b/release/datafiles/userdef/userdef_default_theme.c
index 4506d23b49d..04c077c1c81 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -1,8 +1,8 @@
/*
- * Generated by 'source/tools/utils/blender_theme_as_c.py'
- *
- * Do not hand edit this file!
- */
+* Generated by 'source/tools/utils/blender_theme_as_c.py'
+*
+* Do not hand edit this file!
+*/
#include "DNA_userdef_types.h"
@@ -2038,5 +2038,5 @@ const bTheme U_theme_default = {
.select = RGBA(0x000000ff),
.active = RGBA(0x000000ff),
},
- },
+},
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
