svn merge -r40222:40344 ^/trunk/blender
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Sep 2011 10:48:15 +0000 (10:48 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Sep 2011 10:48:15 +0000 (10:48 +0000)
14 files changed:
1  2 
SConstruct
release/scripts/startup/bl_ui/properties_data_curve.py
source/blender/blenfont/BLF_api.h
source/blender/blenfont/intern/blf.c
source/blender/blenkernel/CMakeLists.txt
source/blender/editors/armature/poselib.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_regions.c
source/blender/imbuf/intern/IMB_indexer.h
source/blender/imbuf/intern/indexer.c
source/blender/makesrna/intern/rna_texture_api.c
source/blender/python/intern/bpy_app_handlers.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c

diff --cc SConstruct
Simple merge
@@@ -103,16 -103,15 +103,15 @@@ class DATA_PT_shape_curve(CurveButtonsP
              sub = col.column()
              sub.label(text="")
              sub = col.column(align=True)
 -            sub.prop(curve, "resolution_v", text="Preview V")
 -            sub.prop(curve, "render_resolution_v", text="Render V")
 +            sub.prop(curve, "resolution_v", text=_("Preview V"))
 +            sub.prop(curve, "render_resolution_v", text=_("Render V"))
  
          if (is_curve or is_text):
 -            col.label(text="Fill:")
 +            col.label(text=_("Fill:"))
              sub = col.column()
              sub.active = (curve.dimensions == '2D' or (curve.bevel_object is None and curve.dimensions == '3D'))
-             sub.prop(curve, "use_fill_front")
-             sub.prop(curve, "use_fill_back")
+             sub.prop(curve, "fill_mode", text="")
 -            col.prop(curve, "use_fill_deform", text="Fill Deformed")
 +            col.prop(curve, "use_fill_deform", text=_("Fill Deformed"))
  
  
  class DATA_PT_curve_texture_space(CurveButtonsPanel, Panel):
Simple merge
@@@ -297,31 -292,20 +297,31 @@@ int BLF_load_mem_unique(const char *nam
  
  void BLF_enable(int fontid, int option)
  {
-       FontBLF *font;
+       FontBLF *font= BLF_get(fontid);
  
-       font= BLF_get(fontid);
-       if (font)
+       if (font) {
                font->flags |= option;
+       }
  }
  
 +const char* BLF_gettext(const char *msgid)
 +{
 +#ifdef INTERNATIONAL
 +      if( msgid[0] )
 +              return gettext( msgid );
 +      return "";
 +#else
 +      return msgid;
 +#endif
 +}
 +
  void BLF_disable(int fontid, int option)
  {
-       FontBLF *font;
+       FontBLF *font= BLF_get(fontid);
  
-       font= BLF_get(fontid);
-       if (font)
+       if (font) {
                font->flags &= ~option;
+       }
  }
  
  void BLF_enable_default(int option)
Simple merge
  
  #include "BIF_gl.h"
  #include "BIF_glutil.h" /* for paint cursor */
 +#include "BLF_api.h"
  
  #include "IMB_imbuf_types.h"
+ #include "IMB_imbuf.h"
  
  #include "ED_screen.h"
  #include "ED_util.h"