Revision: 20829
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20829
Author: yukishiro
Date: 2009-06-12 15:19:20 +0200 (Fri, 12 Jun 2009)
Log Message:
-----------
merge from 20787 to 20828
Modified Paths:
--------------
branches/soc-2009-yukishiro/SConstruct
branches/soc-2009-yukishiro/release/ui/buttons_scene.py
branches/soc-2009-yukishiro/release/ui/buttons_texture.py
branches/soc-2009-yukishiro/release/ui/space_sequencer.py
branches/soc-2009-yukishiro/source/blender/blenfont/BLF_api.h
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_intern.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_regions.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_style.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_templates.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_utils.c
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_camera.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_sequence.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_texture.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-yukishiro/tools/btools.py
Modified: branches/soc-2009-yukishiro/SConstruct
===================================================================
--- branches/soc-2009-yukishiro/SConstruct 2009-06-12 12:56:12 UTC (rev
20828)
+++ branches/soc-2009-yukishiro/SConstruct 2009-06-12 13:19:20 UTC (rev
20829)
@@ -404,6 +404,9 @@
thestatlibs, thelibincs = B.setup_staticlibs(env)
thesyslibs = B.setup_syslibs(env)
+if env['WITH_BF_PLAYER']:
+ print("Warning: Game player may not build on 2.5")
+
if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
#env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist +
thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [],
thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
Modified: branches/soc-2009-yukishiro/release/ui/buttons_scene.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_scene.py 2009-06-12
12:56:12 UTC (rev 20828)
+++ branches/soc-2009-yukishiro/release/ui/buttons_scene.py 2009-06-12
13:19:20 UTC (rev 20829)
@@ -65,17 +65,17 @@
col = split.column()
- if rd.file_format in ("AVIJPEG", "JPEG"):
+ if rd.file_format in ('AVIJPEG', 'JPEG'):
col.itemR(rd, "quality", slider=True)
- elif rd.file_format in ("OPENEXR"):
+ elif rd.file_format == 'OPENEXR':
col.itemR(rd, "exr_codec")
col.itemR(rd, "exr_half")
col = split.column()
col.itemR(rd, "exr_zbuf")
col.itemR(rd, "exr_preview")
- elif rd.file_format in ("JPEG2000"):
+ elif rd.file_format == 'JPEG2000':
row = layout.row()
row.itemR(rd, "jpeg_preset")
split = layout.split()
@@ -86,7 +86,7 @@
col.itemR(rd, "jpeg_ycc")
col.itemR(rd, "exr_preview")
- elif rd.file_format in ("CINEON", "DPX"):
+ elif rd.file_format in ('CINEON', 'DPX'):
col.itemR(rd, "cineon_log", text="Convert to Log")
colsub = col.column()
colsub.active = rd.cineon_log
@@ -94,8 +94,40 @@
colsub.itemR(rd, "cineon_white", text="White")
colsub.itemR(rd, "cineon_gamma", text="Gamma")
- elif rd.file_format in ("TIFF"):
+ elif rd.file_format == 'TIFF':
col.itemR(rd, "tiff_bit")
+
+ elif rd.file_format == 'FFMPEG':
+ #row = layout.row()
+ #row.itemR(rd, "ffmpeg_format")
+ #row.itemR(rd, "ffmpeg_codec")
+ split = layout.split()
+
+ col = split.column()
+ col.itemR(rd, "ffmpeg_video_bitrate")
+ col.itemL(text="Rate:")
+ col.itemR(rd, "ffmpeg_minrate", text="Minimum")
+ col.itemR(rd, "ffmpeg_maxrate", text="Maximum")
+ col.itemR(rd, "ffmpeg_buffersize", text="Buffer")
+
+ col = split.column()
+ col.itemR(rd, "ffmpeg_gopsize")
+ col.itemR(rd, "ffmpeg_autosplit")
+ col.itemL(text="Mux:")
+ col.itemR(rd, "ffmpeg_muxrate", text="Rate")
+ col.itemR(rd, "ffmpeg_packetsize", text="Packet Size")
+
+ row = layout.row()
+ row.itemL(text="Audio:")
+ row = layout.row()
+ #row.itemR(rd, "ffmpeg_audio_codec")
+
+ split = layout.split()
+
+ col = split.column()
+ col.itemR(rd, "ffmpeg_audio_bitrate")
+ col = split.column()
+ col.itemR(rd, "ffmpeg_multiplex_audio")
class RENDER_PT_antialiasing(RenderButtonsPanel):
__label__ = "Anti-Aliasing"
@@ -241,8 +273,8 @@
sub.itemR(rd, "render_stamp")
colsub = sub.column()
colsub.active = rd.render_stamp
- colsub.itemR(rd, "stamp_foreground")
- colsub.itemR(rd, "stamp_background")
+ colsub.itemR(rd, "stamp_foreground", slider=True)
+ colsub.itemR(rd, "stamp_background", slider=True)
colsub.itemR(rd, "stamp_font_size", text="Font Size")
bpy.types.register(RENDER_PT_render)
@@ -250,4 +282,4 @@
bpy.types.register(RENDER_PT_antialiasing)
bpy.types.register(RENDER_PT_shading)
bpy.types.register(RENDER_PT_output)
-bpy.types.register(RENDER_PT_stamp)
\ No newline at end of file
+bpy.types.register(RENDER_PT_stamp)
Modified: branches/soc-2009-yukishiro/release/ui/buttons_texture.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_texture.py 2009-06-12
12:56:12 UTC (rev 20828)
+++ branches/soc-2009-yukishiro/release/ui/buttons_texture.py 2009-06-12
13:19:20 UTC (rev 20829)
@@ -73,6 +73,7 @@
def draw(self, context):
layout = self.layout
tex = context.texture_slot
+ textype = context.texture
split = layout.split(percentage=0.3)
col = split.column()
@@ -80,26 +81,30 @@
col = split.column()
col.itemR(tex, "texture_coordinates", text="")
- split = layout.split()
- col = split.column()
+
if tex.texture_coordinates == 'UV':
- col.itemR(tex, "uv_layer")
+ row = layout.row()
+ row.itemR(tex, "uv_layer")
elif tex.texture_coordinates == 'OBJECT':
- col.itemR(tex, "object")
-
+ row = layout.row()
+ row.itemR(tex, "object")
+
+ if textype.type in ('IMAGE', 'ENVIRONMENT_MAP'):
+ split = layout.split(percentage=0.3)
+ col = split.column()
+ col.itemL(text="Projection:")
+ col = split.column()
+ col.itemR(tex, "mapping", text="")
+
+ split = layout.split()
col = split.column()
col.itemR(tex, "from_dupli")
- split = layout.split(percentage=0.3)
col = split.column()
- col.itemL(text="Projection:")
- col = split.column()
- col.itemR(tex, "mapping", text="")
-
- row = layout.row()
- row.itemR(tex, "x_mapping", text="X")
- row.itemR(tex, "y_mapping", text="Y")
- row.itemR(tex, "z_mapping", text="Z")
+ colrow = col.row()
+ colrow.itemR(tex, "x_mapping", text="")
+ colrow.itemR(tex, "y_mapping", text="")
+ colrow.itemR(tex, "z_mapping", text="")
row = layout.row()
row.column().itemR(tex, "offset")
@@ -117,7 +122,7 @@
split = layout.split()
col = split.column()
- col.itemR(tex, "map_color")
+ col.itemR(tex, "map_color", text="Diffuse Color")
colsub = col.column()
colsub.active = tex.map_color
colsub.itemR(tex, "color_factor", text="Opacity", slider=True)
@@ -177,7 +182,7 @@
else:
split = layout.split()
col = split.column()
- col.itemR(tex, "rgb_factor")
+ col.itemR(tex, "rgb_factor", text="Multiply RGB")
col = split.column()
col.itemL(text="Adjust:")
@@ -491,7 +496,7 @@
split = layout.split()
sub = split.column()
- sub.itemR(tex, "distortion_amount", text="Amount")
+ sub.itemR(tex, "distortion_amount", text="Distortion")
sub.itemR(tex, "noise_size", text="Size")
sub = split.column()
Modified: branches/soc-2009-yukishiro/release/ui/space_sequencer.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_sequencer.py 2009-06-12
12:56:12 UTC (rev 20828)
+++ branches/soc-2009-yukishiro/release/ui/space_sequencer.py 2009-06-12
13:19:20 UTC (rev 20829)
@@ -144,6 +144,7 @@
st = context.space_data
layout.column()
+ layout.itemO("SEQUENCER_OT_scene_strip_add", text="Scene")
layout.itemO("SEQUENCER_OT_movie_strip_add", text="Movie")
layout.item_booleanO("SEQUENCER_OT_movie_strip_add", "sound",
True, text="Movie & Sound") # FFMPEG ONLY
layout.itemO("SEQUENCER_OT_image_strip_add", text="Image")
@@ -285,7 +286,16 @@
col.itemR(strip, "start_frame")
col.itemR(strip, "length")
+ split = layout.split()
+ col = split.column()
+ col.itemR(strip, "start_offset")
+ col.itemR(strip, "start_still")
+
+ col = split.column()
+ col.itemR(strip, "end_offset")
+ col.itemR(strip, "end_still")
+
class SEQUENCER_PT_effect(SequencerButtonsPanel):
__label__ = "Effect Strip"
__idname__ = "SEQUENCER_PT_effect"
@@ -414,16 +424,26 @@
if elem:
sub.itemR(elem, "filename", text="") #
strip.elements[0] could be a fallback
- """
+ layout.itemR(strip, "use_translation")
+ if strip.transform:
+ flow = layout.column_flow()
+ flow.active = strip.use_translation
+ flow.itemR(strip.transform, "offset_x")
+ flow.itemR(strip.transform, "offset_y")
+
+
layout.itemR(strip, "use_crop")
+ if strip.crop:
+ flow = layout.column_flow()
+ flow.active = strip.use_crop
+ flow.itemR(strip.crop, "top")
+ flow.itemR(strip.crop, "left")
+ flow.itemR(strip.crop, "bottom")
+ flow.itemR(strip.crop, "right")
+
+ layout.itemR(strip, "animation_start_offset")
+ layout.itemR(strip, "animation_end_offset")
- flow = layout.column_flow()
- flow.active = strip.use_crop
- flow.itemR(strip, "top")
- flow.itemR(strip, "left")
- flow.itemR(strip, "bottom")
- flow.itemR(strip, "right")
- """
class SEQUENCER_PT_filter(SequencerButtonsPanel):
__label__ = "Filter"
@@ -460,6 +480,19 @@
col.itemR(strip, "reverse_frames", text="Backwards")
layout.itemR(strip, "use_color_balance")
+ if strip.color_balance: # TODO - need to add this somehow
+ row = layout.row()
+ row.active = strip.use_color_balance
+ col = row.column()
+ col.itemR(strip.color_balance, "lift")
+ col.itemR(strip.color_balance, "inverse_lift")
+ col = row.column()
+ col.itemR(strip.color_balance, "gamma")
+ col.itemR(strip.color_balance, "inverse_gamma")
+ col = row.column()
+ col.itemR(strip.color_balance, "gain")
+ col.itemR(strip.color_balance, "inverse_gain")
+
class SEQUENCER_PT_proxy(SequencerButtonsPanel):
__label__ = "Proxy"
@@ -487,11 +520,11 @@
layout = self.layout
- row = layout.row()
- row.itemR(strip, "proxy_custom_directory")
+ flow = layout.column_flow()
+ flow.itemR(strip, "proxy_custom_directory")
if strip.proxy: # TODO - need to add this somehow
- row.itemR(strip.proxy, "dir")
- row.itemR(strip.proxy, "file")
+ flow.itemR(strip.proxy, "directory")
+ flow.itemR(strip.proxy, "file")
class SEQUENCER_PT_view(SequencerButtonsPanel_Output):
Modified: branches/soc-2009-yukishiro/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenfont/BLF_api.h
2009-06-12 12:56:12 UTC (rev 20828)
+++ branches/soc-2009-yukishiro/source/blender/blenfont/BLF_api.h
2009-06-12 13:19:20 UTC (rev 20829)
@@ -85,8 +85,8 @@
void BLF_rotation(float angle);
void BLF_clipping(float xmin, float ymin, float xmax, float ymax);
void BLF_blur(int size);
+void BLF_kerning(int space);
-
void BLF_enable(int option);
void BLF_disable(int option);
@@ -117,6 +117,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)
/* font->mode. */
#define BLF_MODE_TEXTURE 0
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
