Revision: 42863 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42863 Author: mont29 Date: 2011-12-24 14:09:43 +0000 (Sat, 24 Dec 2011) Log Message: ----------- Merged from trunk (-r 42826:42849).
Modified Paths: -------------- branches/vgroup_modifiers/CMakeLists.txt branches/vgroup_modifiers/doc/python_api/rst/change_log.rst branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py branches/vgroup_modifiers/intern/iksolver/intern/IK_Solver.cpp branches/vgroup_modifiers/intern/mikktspace/mikktspace.c branches/vgroup_modifiers/intern/opennl/intern/opennl.c branches/vgroup_modifiers/intern/opennl/superlu/get_perm_c.c branches/vgroup_modifiers/intern/opennl/superlu/scolumn_bmod.c branches/vgroup_modifiers/intern/opennl/superlu/strsv.c branches/vgroup_modifiers/intern/opennl/superlu/sutil.c branches/vgroup_modifiers/intern/opennl/superlu/util.h branches/vgroup_modifiers/release/scripts/modules/bpy_extras/keyconfig_utils.py branches/vgroup_modifiers/source/blender/blenfont/BLF_translation.h branches/vgroup_modifiers/source/blender/blenfont/intern/blf_lang.c branches/vgroup_modifiers/source/blender/blenfont/intern/blf_translation.c branches/vgroup_modifiers/source/blender/blenkernel/BKE_customdata.h branches/vgroup_modifiers/source/blender/blenkernel/depsgraph_private.h branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c branches/vgroup_modifiers/source/blender/blenkernel/intern/fcurve.c branches/vgroup_modifiers/source/blender/blenkernel/intern/image.c branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_validate.c branches/vgroup_modifiers/source/blender/blenkernel/intern/movieclip.c branches/vgroup_modifiers/source/blender/blenkernel/intern/object.c branches/vgroup_modifiers/source/blender/blenkernel/intern/subsurf_ccg.c branches/vgroup_modifiers/source/blender/blenkernel/intern/tracking.c branches/vgroup_modifiers/source/blender/editors/animation/anim_channels_edit.c branches/vgroup_modifiers/source/blender/editors/animation/anim_filter.c branches/vgroup_modifiers/source/blender/editors/include/ED_view3d.h branches/vgroup_modifiers/source/blender/editors/screen/screen_ops.c branches/vgroup_modifiers/source/blender/gpu/intern/gpu_codegen.c branches/vgroup_modifiers/source/blender/gpu/intern/gpu_codegen.h branches/vgroup_modifiers/source/blender/gpu/intern/gpu_draw.c branches/vgroup_modifiers/source/blender/gpu/intern/gpu_extensions.c branches/vgroup_modifiers/source/blender/gpu/intern/gpu_material.c branches/vgroup_modifiers/source/blender/makesdna/DNA_defs.h branches/vgroup_modifiers/source/blender/makesdna/DNA_genfile.h branches/vgroup_modifiers/source/blender/makesdna/DNA_object_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_scene_types.h branches/vgroup_modifiers/source/blender/makesdna/intern/dna_genfile.c branches/vgroup_modifiers/source/blender/makesdna/intern/makesdna.c branches/vgroup_modifiers/source/blender/makesrna/RNA_define.h branches/vgroup_modifiers/source/blender/makesrna/intern/makesrna.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_define.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_internal_types.h branches/vgroup_modifiers/source/blender/makesrna/intern/rna_rna.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_userdef.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_multires.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_shrinkwrap.c branches/vgroup_modifiers/source/blender/python/generic/bgl.c branches/vgroup_modifiers/source/blender/render/intern/raytrace/rayobject_octree.cpp branches/vgroup_modifiers/source/blender/render/intern/source/convertblender.c branches/vgroup_modifiers/source/blender/render/intern/source/pixelshading.c branches/vgroup_modifiers/source/blender/render/intern/source/rayshade.c branches/vgroup_modifiers/source/blender/render/intern/source/renderdatabase.c branches/vgroup_modifiers/source/blender/render/intern/source/shadeoutput.c branches/vgroup_modifiers/source/blender/render/intern/source/strand.c branches/vgroup_modifiers/source/blender/render/intern/source/volumetric.c branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_event_system.c branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_Application.cpp branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PyMath.h Property Changed: ---------------- branches/vgroup_modifiers/ branches/vgroup_modifiers/source/blender/editors/space_outliner/ Property changes on: branches/vgroup_modifiers ___________________________________________________________________ Modified: svn:mergeinfo - /branches/soc-2011-cucumber:37517 /branches/soc-2011-tomato:42376,42378-42379,42397,42400 /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-42826 + /branches/soc-2011-cucumber:37517 /branches/soc-2011-tomato:42376,42378-42379,42397,42400 /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-42849 Modified: branches/vgroup_modifiers/CMakeLists.txt =================================================================== --- branches/vgroup_modifiers/CMakeLists.txt 2011-12-24 13:26:30 UTC (rev 42862) +++ branches/vgroup_modifiers/CMakeLists.txt 2011-12-24 14:09:43 UTC (rev 42863) @@ -281,10 +281,24 @@ message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF") endif() -if(WITH_CODEC_QUICKTIME AND MINGW) - message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF " - "because it is currently unsupported, remove this " - "line if youre a developer who wants to add support.") +if(MINGW) + if(WITH_CODEC_QUICKTIME) + message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF " + "because it is currently unsupported, remove this " + "line if youre a developer who wants to add support.") + endif() + + if(WITH_CYCLES) + message(FATAL_ERROR "MINGW requires WITH_CYCLES to be OFF " + "because it is currently unsupported, remove this " + "line if youre a developer who wants to add support.") + endif() + + if(WITH_IMAGE_OPENEXR) + message(FATAL_ERROR "MINGW requires WITH_IMAGE_OPENEXR to be OFF " + "because it is currently unsupported, remove this " + "line if youre a developer who wants to add support.") + endif() endif() if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM) Modified: branches/vgroup_modifiers/doc/python_api/rst/change_log.rst =================================================================== --- branches/vgroup_modifiers/doc/python_api/rst/change_log.rst 2011-12-24 13:26:30 UTC (rev 42862) +++ branches/vgroup_modifiers/doc/python_api/rst/change_log.rst 2011-12-24 14:09:43 UTC (rev 42863) @@ -1480,3 +1480,640 @@ * :class:`bpy.types.SceneGameData.restrict_animation_updates` * :class:`bpy.types.SceneGameData.show_obstacle_simulation` + +2.60 to 2.61 +============ + +bpy.types.BlendDataGroups +------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataGroups.is_updated` + +bpy.types.BlendDataBrushes +-------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataBrushes.is_updated` + +bpy.types.Theme +--------------- + +Added +^^^^^ + +* :class:`bpy.types.Theme.clip_editor` + +bpy.types.BlendData +------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendData.movieclips` + +bpy.types.BlendDataGreasePencils +-------------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataGreasePencils.is_updated` + +bpy.types.BlendDataImages +------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataImages.is_updated` + +bpy.types.CompositorNodes +------------------------- + +Added +^^^^^ + +* :class:`bpy.types.CompositorNodes.clear` + +bpy.types.BlendDataScenes +------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataScenes.is_updated` + +bpy.types.RenderEngine +---------------------- + +Added +^^^^^ + +* :class:`bpy.types.RenderEngine.bl_use_shading_nodes` +* :class:`bpy.types.RenderEngine.is_animation` +* :class:`bpy.types.RenderEngine.is_preview` +* :class:`bpy.types.RenderEngine.tag_redraw` +* :class:`bpy.types.RenderEngine.tag_update` +* :class:`bpy.types.RenderEngine.update` +* :class:`bpy.types.RenderEngine.update_progress` +* :class:`bpy.types.RenderEngine.view_draw` +* :class:`bpy.types.RenderEngine.view_update` + +bpy.types.BackgroundImage +------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BackgroundImage.clip` +* :class:`bpy.types.BackgroundImage.clip_user` +* :class:`bpy.types.BackgroundImage.show_background_image` +* :class:`bpy.types.BackgroundImage.source` +* :class:`bpy.types.BackgroundImage.use_camera_clip` + +bpy.types.BlendDataMetaBalls +---------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataMetaBalls.is_updated` + +bpy.types.SpaceTimeline +----------------------- + +Added +^^^^^ + +* :class:`bpy.types.SpaceTimeline.cache_dynamicpaint` + +bpy.types.BlendDataMeshes +------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataMeshes.is_updated` + +bpy.types.BlendDataNodeTrees +---------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataNodeTrees.is_updated` + +bpy.types.RenderSettings +------------------------ + +Added +^^^^^ + +* :class:`bpy.types.RenderSettings.image_settings` +* :class:`bpy.types.RenderSettings.use_shading_nodes` + +Removed +^^^^^^^ + +* **cineon_black** +* **cineon_gamma** +* **cineon_white** +* **color_mode** +* **exr_codec** +* **exr_preview** +* **exr_zbuf** +* **file_format** +* **file_quality** +* **jpeg2k_depth** +* **jpeg2k_preset** +* **jpeg2k_ycc** +* **use_cineon_log** +* **use_exr_half** +* **use_tiff_16bit** + +bpy.types.Curve +--------------- + +Added +^^^^^ + +* :class:`bpy.types.Curve.cycles` + +bpy.types.RegionView3D +---------------------- + +Added +^^^^^ + +* :class:`bpy.types.RegionView3D.view_camera_offset` +* :class:`bpy.types.RegionView3D.view_camera_zoom` + +bpy.types.Scene +--------------- + +Added +^^^^^ + +* :class:`bpy.types.Scene.active_clip` +* :class:`bpy.types.Scene.cycles` + +bpy.types.NodeLinks +------------------- + +Added +^^^^^ + +* :class:`bpy.types.NodeLinks.clear` + +bpy.types.BlendDataLattices +--------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataLattices.is_updated` + +bpy.types.BlendDataParticles +---------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataParticles.is_updated` + +bpy.types.BlendDataWorlds +------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataWorlds.is_updated` + +bpy.types.ObjectConstraints +--------------------------- + +Added +^^^^^ + +* :class:`bpy.types.ObjectConstraints.clear` + +bpy.types.RenderLayers +---------------------- + +Added +^^^^^ + +* :class:`bpy.types.RenderLayers.new` +* :class:`bpy.types.RenderLayers.remove` + +bpy.types.Menu +-------------- + +Added +^^^^^ + +* :class:`bpy.types.Menu.bl_description` + +bpy.types.Lamp +-------------- + +Added +^^^^^ + +* :class:`bpy.types.Lamp.cycles` +* :class:`bpy.types.Lamp.node_tree` +* :class:`bpy.types.Lamp.use_nodes` + +bpy.types.CurveSplines +---------------------- + +Added +^^^^^ + +* :class:`bpy.types.CurveSplines.clear` + +bpy.types.Screen +---------------- + +Added +^^^^^ + +* :class:`bpy.types.Screen.use_play_clip_editors` + +bpy.types.BlendDataActions +-------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataActions.is_updated` + +bpy.types.BlendDataSounds +------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataSounds.is_updated` + +bpy.types.Object +---------------- + +Added +^^^^^ + +* :class:`bpy.types.Object.cycles_visibility` +* :class:`bpy.types.Object.slow_parent_offset` + +Removed +^^^^^^^ + +* **time_offset** +* **use_time_offset_add_parent** +* **use_time_offset_edit** +* **use_time_offset_parent** +* **use_time_offset_particle** + +bpy.types.ObjectModifiers +------------------------- + +Added +^^^^^ + +* :class:`bpy.types.ObjectModifiers.clear` + +bpy.types.BlendDataMaterials +---------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataMaterials.is_updated` + +bpy.types.MetaBallElements +-------------------------- + +Added +^^^^^ + +* :class:`bpy.types.MetaBallElements.clear` + +bpy.types.NodeSocket +-------------------- + +Added +^^^^^ + +* :class:`bpy.types.NodeSocket.group_socket` +* :class:`bpy.types.NodeSocket.show_expanded` + +bpy.types.Node +-------------- + +Added +^^^^^ + +* :class:`bpy.types.Node.show_texture` + +bpy.types.CompositorNodeOutputFile +---------------------------------- + +Added +^^^^^ + +* :class:`bpy.types.CompositorNodeOutputFile.image_settings` + +Removed +^^^^^^^ + +* **exr_codec** +* **image_type** +* **quality** +* **use_exr_half** + +bpy.types.BlendDataTexts +------------------------ + +Added +^^^^^ + +* :class:`bpy.types.BlendDataTexts.is_updated` + +bpy.types.ThemeView3D +--------------------- + +Added +^^^^^ + +* :class:`bpy.types.ThemeView3D.bundle_solid` +* :class:`bpy.types.ThemeView3D.camera_path` + +bpy.types.Event +--------------- + +Added +^^^^^ + +* :class:`bpy.types.Event.unicode` + +bpy.types.VertexGroups +---------------------- + +Added +^^^^^ + +* :class:`bpy.types.VertexGroups.clear` + +bpy.types.TexMapping +-------------------- + +Added +^^^^^ + +* :class:`bpy.types.TexMapping.mapping` +* :class:`bpy.types.TexMapping.mapping_x` +* :class:`bpy.types.TexMapping.mapping_y` +* :class:`bpy.types.TexMapping.mapping_z` + +bpy.types.BlendDataObjects +-------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataObjects.is_updated` + +bpy.types.BlendDataCurves +------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataCurves.is_updated` + +bpy.types.BlendDataLibraries +---------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataLibraries.is_updated` + +bpy.types.ThemeUserInterface +---------------------------- + +Added +^^^^^ + +* :class:`bpy.types.ThemeUserInterface.icon_alpha` +* :class:`bpy.types.ThemeUserInterface.panel` + +bpy.types.SpaceNodeEditor +------------------------- + +Added +^^^^^ + +* :class:`bpy.types.SpaceNodeEditor.shader_type` + +bpy.types.SpaceView3D +--------------------- + +Added +^^^^^ + +* :class:`bpy.types.SpaceView3D.show_bundle_names` +* :class:`bpy.types.SpaceView3D.show_camera_path` +* :class:`bpy.types.SpaceView3D.show_reconstruction` +* :class:`bpy.types.SpaceView3D.tracks_draw_size` +* :class:`bpy.types.SpaceView3D.tracks_draw_type` + +bpy.types.BlendDataWindowManagers +--------------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataWindowManagers.is_updated` + +bpy.types.BlendDataScreens +-------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataScreens.is_updated` + +bpy.types.BlendDataArmatures +---------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataArmatures.is_updated` + +bpy.types.UserPreferencesInput +------------------------------ + +Added +^^^^^ + +* :class:`bpy.types.UserPreferencesInput.tweak_threshold` + +Removed +^^^^^^^ + +* **ndof_orbit_invert_axes** + +bpy.types.Mesh +-------------- + +Added +^^^^^ + +* :class:`bpy.types.Mesh.cycles` + +bpy.types.BlendDataCameras +-------------------------- + +Added +^^^^^ + +* :class:`bpy.types.BlendDataCameras.is_updated` + +bpy.types.MetaBall +------------------ + +Added +^^^^^ + @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs