sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merging r44129 through r44139 from trunk into soc-2011-tomato

Browse Source
This commit is contained in:
Sergey Sharybin 2012-02-16 07:11:50 +00:00
commit b5628b45ff
7 changed files with 3787 additions and 3478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

354
doc/python_api/rst/change_log.rst
View File

@ -1636,14 +1636,6 @@ Removed
* **use_exr_half**
* **use_tiff_16bit**
bpy.types.Curve
---------------
Added
^^^^^
* :class:`bpy.types.Curve.cycles`
bpy.types.RegionView3D
----------------------
@ -1660,7 +1652,6 @@ Added
^^^^^
* :class:`bpy.types.Scene.active_clip`
* :class:`bpy.types.Scene.cycles`
bpy.types.NodeLinks
-------------------
@ -1725,7 +1716,6 @@ bpy.types.Lamp
Added
^^^^^
* :class:`bpy.types.Lamp.cycles`
* :class:`bpy.types.Lamp.node_tree`
* :class:`bpy.types.Lamp.use_nodes`
@ -1767,7 +1757,6 @@ bpy.types.Object
Added
^^^^^
* :class:`bpy.types.Object.cycles_visibility`
* :class:`bpy.types.Object.slow_parent_offset`
Removed
@ -1970,14 +1959,6 @@ Removed
* **ndof_orbit_invert_axes**
bpy.types.Mesh
--------------
Added
^^^^^
* :class:`bpy.types.Mesh.cycles`
bpy.types.BlendDataCameras
--------------------------
@ -1986,14 +1967,6 @@ Added
* :class:`bpy.types.BlendDataCameras.is_updated`
bpy.types.MetaBall
------------------
Added
^^^^^
* :class:`bpy.types.MetaBall.cycles`
bpy.types.UILayout
------------------
@ -2028,7 +2001,6 @@ bpy.types.World
Added
^^^^^
* :class:`bpy.types.World.cycles`
* :class:`bpy.types.World.node_tree`
* :class:`bpy.types.World.use_nodes`
@ -2064,14 +2036,6 @@ Added
* :class:`bpy.types.SpaceFileBrowser.active_operator`
bpy.types.Material
------------------
Added
^^^^^
* :class:`bpy.types.Material.cycles`
bpy.types.BlendDataSpeakers
---------------------------
@ -2088,7 +2052,6 @@ Added
* :class:`bpy.types.Camera.angle_x`
* :class:`bpy.types.Camera.angle_y`
* :class:`bpy.types.Camera.cycles`
* :class:`bpy.types.Camera.sensor_fit`
* :class:`bpy.types.Camera.sensor_height`
* :class:`bpy.types.Camera.sensor_width`
@ -2117,3 +2080,320 @@ Added
^^^^^
* :class:`bpy.types.BlendDataFonts.is_updated`
2.61 to 2.62
============
bpy.types.SpaceTimeline
-----------------------
Added
^^^^^
* :class:`bpy.types.SpaceTimeline.show_seconds`
bpy.types.MovieClipProxy
------------------------
Added
^^^^^
* :class:`bpy.types.MovieClipProxy.build_undistorted_100`
* :class:`bpy.types.MovieClipProxy.build_undistorted_25`
* :class:`bpy.types.MovieClipProxy.build_undistorted_50`
* :class:`bpy.types.MovieClipProxy.build_undistorted_75`
Removed
^^^^^^^
* **build_undistorted**
bpy.types.ToolSettings
----------------------
Added
^^^^^
* :class:`bpy.types.ToolSettings.unified_paint_settings`
* :class:`bpy.types.ToolSettings.use_uv_sculpt`
* :class:`bpy.types.ToolSettings.uv_relax_method`
* :class:`bpy.types.ToolSettings.uv_sculpt`
* :class:`bpy.types.ToolSettings.uv_sculpt_all_islands`
* :class:`bpy.types.ToolSettings.uv_sculpt_lock_borders`
* :class:`bpy.types.ToolSettings.uv_sculpt_tool`
Removed
^^^^^^^
* **sculpt_paint_use_unified_size**
* **sculpt_paint_use_unified_strength**
bpy.types.DupliObject
---------------------
Added
^^^^^
* :class:`bpy.types.DupliObject.hide`
bpy.types.Curve
---------------
Added
^^^^^
* :class:`bpy.types.Curve.use_fill_caps`
bpy.types.DomainFluidSettings
-----------------------------
Added
^^^^^
* :class:`bpy.types.DomainFluidSettings.frame_offset`
* :class:`bpy.types.DomainFluidSettings.simulation_rate`
bpy.types.SceneGameData
-----------------------
Added
^^^^^
* :class:`bpy.types.SceneGameData.exit_key`
* :class:`bpy.types.SceneGameData.samples`
* :class:`bpy.types.SceneGameData.use_desktop`
bpy.types.Sensor
----------------
Added
^^^^^
* :class:`bpy.types.Sensor.controllers`
bpy.types.Scene
---------------
Removed
^^^^^^^
* **collada_export**
bpy.types.Controller
--------------------
Added
^^^^^
* :class:`bpy.types.Controller.actuators`
bpy.types.SceneRenderLayer
--------------------------
Added
^^^^^
* :class:`bpy.types.SceneRenderLayer.use_pass_diffuse_color`
* :class:`bpy.types.SceneRenderLayer.use_pass_diffuse_direct`
* :class:`bpy.types.SceneRenderLayer.use_pass_diffuse_indirect`
* :class:`bpy.types.SceneRenderLayer.use_pass_glossy_color`
* :class:`bpy.types.SceneRenderLayer.use_pass_glossy_direct`
* :class:`bpy.types.SceneRenderLayer.use_pass_glossy_indirect`
* :class:`bpy.types.SceneRenderLayer.use_pass_transmission_color`
* :class:`bpy.types.SceneRenderLayer.use_pass_transmission_direct`
* :class:`bpy.types.SceneRenderLayer.use_pass_transmission_indirect`
bpy.types.ClothSettings
-----------------------
Added
^^^^^
* :class:`bpy.types.ClothSettings.vel_damping`
bpy.types.FollowTrackConstraint
-------------------------------
Added
^^^^^
* :class:`bpy.types.FollowTrackConstraint.camera`
* :class:`bpy.types.FollowTrackConstraint.depth_object`
* :class:`bpy.types.FollowTrackConstraint.object`
bpy.types.ImageFormatSettings
-----------------------------
Removed
^^^^^^^
* **exr_codec**
* **use_jpeg2k_cinema_48**
* **use_jpeg2k_cinema_preset**
* **use_jpeg2k_ycc**
bpy.types.Property
------------------
Added
^^^^^
* :class:`bpy.types.Property.translation_context`
bpy.types.MovieTrackingTrack
----------------------------
Added
^^^^^
* :class:`bpy.types.MovieTrackingTrack.use_grayscale_preview`
Removed
^^^^^^^
* **marker_find_frame**
bpy.types.Object
----------------
Added
^^^^^
* :class:`bpy.types.Object.dm_info`
bpy.types.UserPreferencesSystem
-------------------------------
Added
^^^^^
* :class:`bpy.types.UserPreferencesSystem.compute_device`
* :class:`bpy.types.UserPreferencesSystem.compute_device_type`
* :class:`bpy.types.UserPreferencesSystem.use_16bit_textures`
bpy.types.SpaceClipEditor
-------------------------
Added
^^^^^
* :class:`bpy.types.SpaceClipEditor.lock_time_cursor`
* :class:`bpy.types.SpaceClipEditor.show_blue_channel`
* :class:`bpy.types.SpaceClipEditor.show_green_channel`
* :class:`bpy.types.SpaceClipEditor.show_red_channel`
* :class:`bpy.types.SpaceClipEditor.use_grayscale_preview`
Removed
^^^^^^^
* **show_grease_pencil**
* **show_pyramid_levels**
bpy.types.VertexPaint
---------------------
Added
^^^^^
* :class:`bpy.types.VertexPaint.use_group_restrict`
bpy.types.DynamicPaintSurface
-----------------------------
Added
^^^^^
* :class:`bpy.types.DynamicPaintSurface.brush_influence_scale`
* :class:`bpy.types.DynamicPaintSurface.brush_radius_scale`
* :class:`bpy.types.DynamicPaintSurface.color_dry_threshold`
* :class:`bpy.types.DynamicPaintSurface.use_drying`
bpy.types.RenderLayer
---------------------
Added
^^^^^
* :class:`bpy.types.RenderLayer.use_pass_diffuse_color`
* :class:`bpy.types.RenderLayer.use_pass_diffuse_direct`
* :class:`bpy.types.RenderLayer.use_pass_diffuse_indirect`
* :class:`bpy.types.RenderLayer.use_pass_glossy_color`
* :class:`bpy.types.RenderLayer.use_pass_glossy_direct`
* :class:`bpy.types.RenderLayer.use_pass_glossy_indirect`
* :class:`bpy.types.RenderLayer.use_pass_transmission_color`
* :class:`bpy.types.RenderLayer.use_pass_transmission_direct`
* :class:`bpy.types.RenderLayer.use_pass_transmission_indirect`
bpy.types.MovieTracking
-----------------------
Added
^^^^^
* :class:`bpy.types.MovieTracking.active_object_index`
* :class:`bpy.types.MovieTracking.objects`
bpy.types.MovieTrackingSettings
-------------------------------
Added
^^^^^
* :class:`bpy.types.MovieTrackingSettings.object_distance`
* :class:`bpy.types.MovieTrackingSettings.use_default_blue_channel`
* :class:`bpy.types.MovieTrackingSettings.use_default_green_channel`
* :class:`bpy.types.MovieTrackingSettings.use_default_red_channel`
bpy.types.Mesh
--------------
Added
^^^^^
* :class:`bpy.types.Mesh.show_extra_indices`
bpy.types.SpaceSequenceEditor
-----------------------------
Added
^^^^^
* :class:`bpy.types.SpaceSequenceEditor.show_seconds`
Removed
^^^^^^^
* **offset_x**
* **offset_y**
* **zoom**
bpy.types.RenderSettings
------------------------
Added
^^^^^
* :class:`bpy.types.RenderSettings.ffmpeg`
* :class:`bpy.types.RenderSettings.use_color_unpremultiply`
Removed
^^^^^^^
* **ffmpeg_audio_bitrate**
* **ffmpeg_audio_channels**
* **ffmpeg_audio_codec**
* **ffmpeg_audio_mixrate**
* **ffmpeg_audio_volume**
* **ffmpeg_autosplit**
* **ffmpeg_buffersize**
* **ffmpeg_codec**
* **ffmpeg_format**
* **ffmpeg_gopsize**
* **ffmpeg_maxrate**
* **ffmpeg_minrate**
* **ffmpeg_muxrate**
* **ffmpeg_packetsize**
* **ffmpeg_video_bitrate**

BIN
release/datafiles/splash.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 108 KiB

2
release/scripts/modules/bpy_extras/image_utils.py
View File

@ -97,7 +97,7 @@ def load_image(imagepath,
# image path has been checked so the path could not be read for some
# reason, so be sure to return a placeholder
if place_holder:
if place_holder and image is None:
image = _image_load_placeholder(path)
return image

6
source/blender/blenkernel/BKE_blender.h
View File

@ -41,8 +41,8 @@ extern "C" {
/* these lines are grep'd, watch out for our not-so-awesome regex
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 261
#define BLENDER_SUBVERSION 4
#define BLENDER_VERSION 262
#define BLENDER_SUBVERSION 0
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
@ -51,7 +51,7 @@ extern "C" {
/* can be left blank, otherwise a,b,c... etc with no quotes */
#define BLENDER_VERSION_CHAR
/* alpha/beta/rc/release, docs use this */
#define BLENDER_VERSION_CYCLE rc
#define BLENDER_VERSION_CYCLE release
extern char versionstr[]; /* from blender.c */

20
source/blender/blenloader/intern/readfile.c
View File

@ -13069,19 +13069,17 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
/* put compatibility code here until next subversion bump */
if (main->versionfile < 262)
{
{
Object *ob;
for(ob=main->object.first; ob; ob= ob->id.next) {
ModifierData *md;
Object *ob;
for(ob=main->object.first; ob; ob= ob->id.next) {
ModifierData *md;
for (md=ob->modifiers.first; md; md=md->next) {
if (md->type==eModifierType_Cloth) {
ClothModifierData *clmd = (ClothModifierData*) md;
if(clmd->sim_parms)
clmd->sim_parms->vel_damping = 1.0f;
}
for (md=ob->modifiers.first; md; md=md->next) {
if (md->type==eModifierType_Cloth) {
ClothModifierData *clmd = (ClothModifierData*) md;
if(clmd->sim_parms)
clmd->sim_parms->vel_damping = 1.0f;
}
}
}

6874
source/blender/editors/datafiles/splash.png.c
View File

File diff suppressed because it is too large Load Diff

5
source/blender/editors/space_image/image_ops.c
View File

@ -886,6 +886,11 @@ static int image_replace_exec(bContext *C, wmOperator *op)
/* we cant do much if the str is longer then FILE_MAX :/ */
BLI_strncpy(sima->image->name, str, sizeof(sima->image->name));
if (BLI_testextensie_array(str, imb_ext_movie))
sima->image->source= IMA_SRC_MOVIE;
else
sima->image->source= IMA_SRC_FILE;
/* XXX unpackImage frees image buffers */
ED_preview_kill_jobs(C);