Woops… Sorry, my bad, it's my checkout that did not worked completely… :/ No merge mismatch!
On 26/11/2012 08:27, Bastien Montagne wrote: > Hi Tamito, > > Looks like the merge missed some files (at least, recent changes in > SConstruct and CMakeList.txt were lost)… Stupid svn… :/ > > Best regards, > Bastien > > On 26/11/2012 03:41, Tamito Kajiyama wrote: >> Revision: 52551 >> >> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52551 >> Author: kjym3 >> Date: 2012-11-26 02:41:46 +0000 (Mon, 26 Nov 2012) >> Log Message: >> ----------- >> Made changes to BLF_translation.h as noted in blenkernel/intern/idcode.c. >> >> Modified Paths: >> -------------- >> branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h >> >> branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c >> >> Modified: >> branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h >> =================================================================== >> --- branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h >> 2012-11-26 02:36:23 UTC (rev 52550) >> +++ branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h >> 2012-11-26 02:41:46 UTC (rev 52551) >> @@ -115,6 +115,7 @@ >> #define BLF_I18NCONTEXT_ID_BRUSH "Brush" >> #define BLF_I18NCONTEXT_ID_CAMERA "Camera" >> #define BLF_I18NCONTEXT_ID_CURVE "Curve" >> +#define BLF_I18NCONTEXT_ID_FREESTYLELINESTYLE "FreestyleLineStyle" >> #define BLF_I18NCONTEXT_ID_GPENCIL "GPencil" >> #define BLF_I18NCONTEXT_ID_GROUP "Group" >> #define BLF_I18NCONTEXT_ID_ID "ID" >> >> Modified: >> branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c >> =================================================================== >> --- >> branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c >> 2012-11-26 02:36:23 UTC (rev 52550) >> +++ >> branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c >> 2012-11-26 02:41:46 UTC (rev 52551) >> @@ -514,7 +514,8 @@ >> BLF_I18NCONTEXT_ID_NODETREE, >> BLF_I18NCONTEXT_ID_BRUSH, >> >> BLF_I18NCONTEXT_ID_PARTICLESETTINGS, >> - BLF_I18NCONTEXT_ID_GPENCIL); >> + BLF_I18NCONTEXT_ID_GPENCIL, >> + >> BLF_I18NCONTEXT_ID_FREESTYLELINESTYLE); >> >> if (newop) { >> but = uiDefIconTextButO(block, BUT, newop, >> WM_OP_INVOKE_DEFAULT, ICON_ZOOMIN, >> >> _______________________________________________ >> Bf-blender-cvs mailing list >> [email protected] >> http://lists.blender.org/mailman/listinfo/bf-blender-cvs >> > _______________________________________________ > Bf-committers mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-committers _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
