Revision: 21513
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21513
Author: aligorith
Date: 2009-07-11 05:23:45 +0200 (Sat, 11 Jul 2009)
Log Message:
-----------
NLA SoC: Merge from 2.5
21470 to 21512
Next up, NLA-branch to 2.5 :)
Modified Paths:
--------------
branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2009-aligorith/release/ui/buttons_data_lamp.py
branches/soc-2009-aligorith/release/ui/buttons_particle.py
branches/soc-2009-aligorith/release/ui/buttons_scene.py
branches/soc-2009-aligorith/release/ui/space_sequencer.py
branches/soc-2009-aligorith/source/blender/blenfont/BLF_api.h
branches/soc-2009-aligorith/source/blender/blenfont/intern/blf.c
branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_font.c
branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2009-aligorith/source/blender/blenkernel/intern/image.c
branches/soc-2009-aligorith/source/blender/blenlib/BLI_util.h
branches/soc-2009-aligorith/source/blender/blenlib/intern/util.c
branches/soc-2009-aligorith/source/blender/blenloader/intern/readfile.c
branches/soc-2009-aligorith/source/blender/blenloader/intern/writefile.c
branches/soc-2009-aligorith/source/blender/editors/include/ED_transform.h
branches/soc-2009-aligorith/source/blender/editors/interface/interface.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_intern.h
branches/soc-2009-aligorith/source/blender/editors/interface/interface_layout.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_regions.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_style.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_templates.c
branches/soc-2009-aligorith/source/blender/editors/interface/view2d.c
branches/soc-2009-aligorith/source/blender/editors/interface/view2d_ops.c
branches/soc-2009-aligorith/source/blender/editors/mesh/editmesh.c
branches/soc-2009-aligorith/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-aligorith/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-aligorith/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-aligorith/source/blender/editors/object/editgroup.c
branches/soc-2009-aligorith/source/blender/editors/object/object_edit.c
branches/soc-2009-aligorith/source/blender/editors/object/object_intern.h
branches/soc-2009-aligorith/source/blender/editors/object/object_ops.c
branches/soc-2009-aligorith/source/blender/editors/screen/screen_ops.c
branches/soc-2009-aligorith/source/blender/editors/space_file/file_draw.c
branches/soc-2009-aligorith/source/blender/editors/space_file/file_intern.h
branches/soc-2009-aligorith/source/blender/editors/space_file/file_ops.c
branches/soc-2009-aligorith/source/blender/editors/space_file/filesel.c
branches/soc-2009-aligorith/source/blender/editors/space_file/space_file.c
branches/soc-2009-aligorith/source/blender/editors/space_image/image_draw.c
branches/soc-2009-aligorith/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2009-aligorith/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2009-aligorith/source/blender/editors/space_text/text_draw.c
branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2009-aligorith/source/blender/editors/transform/transform_ops.c
branches/soc-2009-aligorith/source/blender/editors/transform/transform_orientations.c
branches/soc-2009-aligorith/source/blender/makesdna/DNA_image_types.h
branches/soc-2009-aligorith/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-aligorith/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-aligorith/source/blender/makesrna/RNA_access.h
branches/soc-2009-aligorith/source/blender/makesrna/RNA_define.h
branches/soc-2009-aligorith/source/blender/makesrna/RNA_types.h
branches/soc-2009-aligorith/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_ui.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-aligorith/source/blender/python/generic/Mathutils.h
branches/soc-2009-aligorith/source/blender/python/intern/bpy_rna.c
branches/soc-2009-aligorith/source/blender/python/intern/bpy_util.c
branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_files.c
branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_operators.c
Removed Paths:
-------------
branches/soc-2009-aligorith/source/blender/editors/space_file/file_header.c
Modified:
branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
---
branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-11 03:09:44 UTC (rev 21512)
+++
branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-11 03:23:45 UTC (rev 21513)
@@ -747,10 +747,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\editors\space_file\file_header.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\space_file\file_intern.h"
>
</File>
Modified: branches/soc-2009-aligorith/release/ui/buttons_data_lamp.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_data_lamp.py 2009-07-11
03:09:44 UTC (rev 21512)
+++ branches/soc-2009-aligorith/release/ui/buttons_data_lamp.py 2009-07-11
03:23:45 UTC (rev 21513)
@@ -48,7 +48,7 @@
lamp = context.lamp
- layout.itemR(lamp, "type", expand=True)
+ layout.itemR(lamp, "type")
split = layout.split()
Modified: branches/soc-2009-aligorith/release/ui/buttons_particle.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_particle.py 2009-07-11
03:09:44 UTC (rev 21512)
+++ branches/soc-2009-aligorith/release/ui/buttons_particle.py 2009-07-11
03:23:45 UTC (rev 21513)
@@ -20,7 +20,7 @@
class PARTICLE_PT_particles(ParticleButtonsPanel):
__idname__= "PARTICLE_PT_particles"
- __label__ = " "
+ __no_header__ = True
def poll(self, context):
return (context.particle_system or context.object)
Modified: branches/soc-2009-aligorith/release/ui/buttons_scene.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_scene.py 2009-07-11
03:09:44 UTC (rev 21512)
+++ branches/soc-2009-aligorith/release/ui/buttons_scene.py 2009-07-11
03:23:45 UTC (rev 21513)
@@ -35,6 +35,8 @@
layout = self.layout
rd = context.scene.render_data
+ layout.itemR(rd, "display_mode", text="Display")
+
layout.itemR(rd, "output_path")
split = layout.split()
@@ -54,7 +56,6 @@
col.itemR(rd, "placeholders")
col.itemR(rd, "no_overwrite")
-
layout.itemR(rd, "file_format", text="Format")
split = layout.split()
Modified: branches/soc-2009-aligorith/release/ui/space_sequencer.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/space_sequencer.py 2009-07-11
03:09:44 UTC (rev 21512)
+++ branches/soc-2009-aligorith/release/ui/space_sequencer.py 2009-07-11
03:23:45 UTC (rev 21513)
@@ -242,7 +242,7 @@
layout.itemO("SEQUENCER_OT_mute")
layout.itemO("SEQUENCER_OT_unmute")
- layout.item_enumO("SEQUENCER_OT_mute", property="type",
value='UNSELECTED', text="Mute Deselected Strips")
+ layout.item_booleanO("SEQUENCER_OT_mute", "unselected", 1,
text="Mute Deselected Strips")
layout.itemO("SEQUENCER_OT_snap")
Modified: branches/soc-2009-aligorith/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/soc-2009-aligorith/source/blender/blenfont/BLF_api.h
2009-07-11 03:09:44 UTC (rev 21512)
+++ branches/soc-2009-aligorith/source/blender/blenfont/BLF_api.h
2009-07-11 03:23:45 UTC (rev 21513)
@@ -90,7 +90,6 @@
void BLF_rotation(float angle);
void BLF_clipping(float xmin, float ymin, float xmax, float ymax);
void BLF_blur(int size);
-void BLF_kerning(float space);
void BLF_enable(int option);
void BLF_disable(int option);
@@ -137,10 +136,8 @@
/* font->flags. */
#define BLF_ROTATION (1<<0)
#define BLF_CLIPPING (1<<1)
-#define BLF_FONT_KERNING (1<<2)
-#define BLF_USER_KERNING (1<<3)
-#define BLF_SHADOW (1<<4)
-#define BLF_OVERLAP_CHAR (1<<5)
+#define BLF_SHADOW (1<<2)
+#define BLF_KERNING_DEFAULT (1<<3)
/* font->mode. */
#define BLF_MODE_TEXTURE 0
Modified: branches/soc-2009-aligorith/source/blender/blenfont/intern/blf.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/blenfont/intern/blf.c
2009-07-11 03:09:44 UTC (rev 21512)
+++ branches/soc-2009-aligorith/source/blender/blenfont/intern/blf.c
2009-07-11 03:23:45 UTC (rev 21513)
@@ -505,15 +505,6 @@
font->mode= mode;
}
-void BLF_kerning(float space)
-{
- FontBLF *font;
-
- font= global_font[global_font_cur];
- if (font)
- font->kerning= space;
-}
-
void BLF_shadow(int level, float r, float g, float b, float a)
{
FontBLF *font;
Modified: branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_font.c
2009-07-11 03:09:44 UTC (rev 21512)
+++ branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_font.c
2009-07-11 03:23:45 UTC (rev 21513)
@@ -101,8 +101,8 @@
GlyphBLF *g, *g_prev;
FT_Vector delta;
FT_UInt glyph_index, g_prev_index;
- float pen_x, pen_y, old_pen_x;
- int i, has_kerning;
+ int pen_x, pen_y;
+ int i, has_kerning, st;
if (!font->glyph_cache)
return;
@@ -139,33 +139,21 @@
else if (font->mode == BLF_MODE_TEXTURE && (!g->tex_data))
g= blf_glyph_add(font, glyph_index, c);
- if ((font->flags & BLF_FONT_KERNING) && has_kerning && g_prev) {
- old_pen_x= pen_x;
+ if (has_kerning && g_prev) {
delta.x= 0;
delta.y= 0;
- if (FT_Get_Kerning(font->face, g_prev_index,
glyph_index, FT_KERNING_UNFITTED, &delta) == 0) {
- pen_x += delta.x >> 6;
+ if (font->flags & BLF_KERNING_DEFAULT)
+ st= FT_Get_Kerning(font->face, g_prev_index,
glyph_index, ft_kerning_default, &delta);
+ else
+ st= FT_Get_Kerning(font->face, g_prev_index,
glyph_index, FT_KERNING_UNFITTED, &delta);
- if (font->flags & BLF_OVERLAP_CHAR) {
- if (pen_x < old_pen_x)
- pen_x= old_pen_x;
- }
- }
+ if (st == 0)
+ pen_x += delta.x >> 6;
}
- if (font->flags & BLF_USER_KERNING) {
- old_pen_x= pen_x;
- pen_x += font->kerning;
-
- if (font->flags & BLF_OVERLAP_CHAR) {
- if (pen_x < old_pen_x)
- pen_x= old_pen_x;
- }
- }
-
/* do not return this loop if clipped, we want every character
tested */
- blf_glyph_render(font, g, pen_x, pen_y);
+ blf_glyph_render(font, g, (float)pen_x, (float)pen_y);
pen_x += g->advance;
g_prev= g;
@@ -180,8 +168,8 @@
FT_Vector delta;
FT_UInt glyph_index, g_prev_index;
rctf gbox;
- float pen_x, pen_y, old_pen_x;
- int i, has_kerning;
+ int pen_x, pen_y;
+ int i, has_kerning, st;
if (!font->glyph_cache)
return;
@@ -223,31 +211,19 @@
else if (font->mode == BLF_MODE_TEXTURE && (!g->tex_data))
g= blf_glyph_add(font, glyph_index, c);
- if ((font->flags & BLF_FONT_KERNING) && has_kerning && g_prev) {
- old_pen_x= pen_x;
+ if (has_kerning && g_prev) {
delta.x= 0;
delta.y= 0;
- if (FT_Get_Kerning(font->face, g_prev_index,
glyph_index, FT_KERNING_UNFITTED, &delta) == 0) {
- pen_x += delta.x >> 6;
+ if (font->flags & BLF_KERNING_DEFAULT)
+ st= FT_Get_Kerning(font->face, g_prev_index,
glyph_index, ft_kerning_default, &delta);
+ else
+ st= FT_Get_Kerning(font->face, g_prev_index,
glyph_index, FT_KERNING_UNFITTED, &delta);
- if (font->flags & BLF_OVERLAP_CHAR) {
- if (pen_x < old_pen_x)
- pen_x= old_pen_x;
- }
- }
+ if (st == 0)
+ pen_x += delta.x >> 6;
}
- if (font->flags & BLF_USER_KERNING) {
- old_pen_x= pen_x;
- pen_x += font->kerning;
-
- if (font->flags & BLF_OVERLAP_CHAR) {
- if (pen_x < old_pen_x)
- pen_x= old_pen_x;
- }
- }
-
gbox.xmin= g->box.xmin + pen_x;
gbox.xmax= g->box.xmax + pen_x;
gbox.ymin= g->box.ymin + pen_y;
@@ -329,10 +305,9 @@
font->clip_rec.xmax= 0.0f;
font->clip_rec.ymin= 0.0f;
font->clip_rec.ymax= 0.0f;
- font->flags= BLF_USER_KERNING | BLF_FONT_KERNING;
+ font->flags= 0;
font->dpi= 0;
font->size= 0;
- font->kerning= 0.0f;
font->cache.first= NULL;
font->cache.last= NULL;
font->glyph_cache= NULL;
Modified: branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_glyph.c
2009-07-11 03:09:44 UTC (rev 21512)
+++ branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_glyph.c
2009-07-11 03:23:45 UTC (rev 21513)
@@ -213,11 +213,7 @@
else
do_new= 1;
- if (font->flags & BLF_FONT_KERNING)
- err= FT_Load_Glyph(font->face, index, FT_LOAD_NO_BITMAP);
- else
- err= FT_Load_Glyph(font->face, index, FT_LOAD_NO_HINTING |
FT_LOAD_NO_BITMAP);
-
+ err= FT_Load_Glyph(font->face, index, FT_LOAD_NO_HINTING |
FT_LOAD_NO_BITMAP);
if (err)
return(NULL);
@@ -332,11 +328,7 @@
else
do_new= 1;
- if (font->flags & BLF_FONT_KERNING)
- err= FT_Load_Glyph(font->face, index, FT_LOAD_NO_BITMAP);
- else
- err= FT_Load_Glyph(font->face, index, FT_LOAD_NO_HINTING |
FT_LOAD_NO_BITMAP);
-
+ err= FT_Load_Glyph(font->face, index, FT_LOAD_NO_HINTING |
FT_LOAD_NO_BITMAP);
if (err)
return(NULL);
Modified:
branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_internal_types.h
===================================================================
---
branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_internal_types.h
2009-07-11 03:09:44 UTC (rev 21512)
+++
branches/soc-2009-aligorith/source/blender/blenfont/intern/blf_internal_types.h
2009-07-11 03:23:45 UTC (rev 21513)
@@ -177,9 +177,6 @@
/* font size. */
int size;
- /* kerning space, user setting. */
- float kerning;
-
/* max texture size. */
int max_tex_size;
Modified: branches/soc-2009-aligorith/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/blenkernel/intern/image.c
2009-07-11 03:09:44 UTC (rev 21512)
+++ branches/soc-2009-aligorith/source/blender/blenkernel/intern/image.c
2009-07-11 03:23:45 UTC (rev 21513)
@@ -253,6 +253,10 @@
if (ima->preview) {
BKE_previewimg_free(&ima->preview);
}
+ if (ima->render_text) {
+ MEM_freeN(ima->render_text);
+ ima->render_text= NULL;
+ }
}
/* only image block itself */
Modified: branches/soc-2009-aligorith/source/blender/blenlib/BLI_util.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
