[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48648] branches/soc-2012-sushi: svn merge ^/trunk/blender -r48609:48645
Alexander Pinzon
apinzonf at gmail.com
Thu Jul 5 15:30:31 CEST 2012
Revision: 48648
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48648
Author: apinzonf
Date: 2012-07-05 13:30:31 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48609:48645
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48609
Modified Paths:
--------------
branches/soc-2012-sushi/CMakeLists.txt
branches/soc-2012-sushi/SConstruct
branches/soc-2012-sushi/build_files/scons/config/win64-mingw-config.py
branches/soc-2012-sushi/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2012-sushi/intern/audaspace/intern/AUD_C-API.h
branches/soc-2012-sushi/intern/ghost/GHOST_C-api.h
branches/soc-2012-sushi/release/scripts/modules/console_shell.py
branches/soc-2012-sushi/release/scripts/presets/tracking_settings/blurry_footage.py
branches/soc-2012-sushi/release/scripts/presets/tracking_settings/blurry_movie.py
branches/soc-2012-sushi/release/scripts/presets/tracking_settings/default.py
branches/soc-2012-sushi/release/scripts/presets/tracking_settings/fast_motion.py
branches/soc-2012-sushi/release/scripts/startup/bl_operators/clip.py
branches/soc-2012-sushi/release/scripts/startup/bl_operators/presets.py
branches/soc-2012-sushi/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2012-sushi/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_console.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_image.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2012-sushi/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-sushi/release/scripts/templates/addon_add_object.py
branches/soc-2012-sushi/release/scripts/templates/gamelogic.py
branches/soc-2012-sushi/release/scripts/templates/ui_panel_simple.py
branches/soc-2012-sushi/source/blender/blenkernel/CMakeLists.txt
branches/soc-2012-sushi/source/blender/blenkernel/SConscript
branches/soc-2012-sushi/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2012-sushi/source/blender/blenkernel/intern/node.c
branches/soc-2012-sushi/source/blender/blenlib/BLI_args.h
branches/soc-2012-sushi/source/blender/blenlib/BLI_math_geom.h
branches/soc-2012-sushi/source/blender/blenlib/intern/BLI_args.c
branches/soc-2012-sushi/source/blender/blenlib/intern/math_geom.c
branches/soc-2012-sushi/source/blender/blenlib/intern/pbvh.c
branches/soc-2012-sushi/source/blender/collada/GeometryExporter.h
branches/soc-2012-sushi/source/blender/collada/ImageExporter.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2012-sushi/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2012-sushi/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2012-sushi/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2012-sushi/source/blender/editors/object/object_relations.c
branches/soc-2012-sushi/source/blender/editors/space_time/space_time.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-sushi/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2012-sushi/source/blender/editors/transform/transform.c
branches/soc-2012-sushi/source/blender/editors/transform/transform_snap.c
branches/soc-2012-sushi/source/blender/imbuf/intern/readimage.c
branches/soc-2012-sushi/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-sushi/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/soc-2012-sushi/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2012-sushi/source/creator/CMakeLists.txt
branches/soc-2012-sushi/source/gameengine/Ketsji/KX_SoundActuator.cpp
Property Changed:
----------------
branches/soc-2012-sushi/
branches/soc-2012-sushi/release/scripts/templates/operator_modal_view3d_raycast.py
Property changes on: branches/soc-2012-sushi
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:46810-48609
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:46810-48645
Modified: branches/soc-2012-sushi/CMakeLists.txt
===================================================================
--- branches/soc-2012-sushi/CMakeLists.txt 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/CMakeLists.txt 2012-07-05 13:30:31 UTC (rev 48648)
@@ -148,7 +148,7 @@
# (unix defaults to OpenMP On)
-if(UNIX AND NOT APPLE)
+if((UNIX AND NOT APPLE) OR (MINGW))
set(PLATFORM_DEFAULT ON)
else()
set(PLATFORM_DEFAULT OFF)
Modified: branches/soc-2012-sushi/SConstruct
===================================================================
--- branches/soc-2012-sushi/SConstruct 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/SConstruct 2012-07-05 13:30:31 UTC (rev 48648)
@@ -769,8 +769,13 @@
if env['WITH_BF_SDL']:
dllsources.append('${LCGDIR}/sdl/lib/SDL.dll')
+ if(env['WITH_BF_OPENMP']):
+ dllsources.append('${LCGDIR}/binaries/libgomp-1.dll')
+
dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
- dllsources.append('${LCGDIR}/binaries/pthreadGC2-w64.dll')
+ dllsources.append('${LCGDIR}/binaries/libgcc_s_sjlj-1.dll')
+ dllsources.append('${LCGDIR}/binaries/libwinpthread-1.dll')
+ dllsources.append('${LCGDIR}/binaries/libstdc++-6.dll)')
dllsources.append('#source/icons/blender.exe.manifest')
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
Modified: branches/soc-2012-sushi/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2012-sushi/build_files/scons/config/win64-mingw-config.py 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/build_files/scons/config/win64-mingw-config.py 2012-07-05 13:30:31 UTC (rev 48648)
@@ -169,8 +169,8 @@
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
-#Produces errors while rendering with subsurf/multires,
-WITH_BF_OPENMP = False
+#May produce errors with unsupported MinGW-w64 builds
+WITH_BF_OPENMP = True
##
CC = 'gcc'
Modified: branches/soc-2012-sushi/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/soc-2012-sushi/intern/audaspace/intern/AUD_C-API.cpp 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/intern/audaspace/intern/AUD_C-API.cpp 2012-07-05 13:30:31 UTC (rev 48648)
@@ -244,7 +244,7 @@
return module;
}
-PyObject* AUD_getPythonFactory(AUD_Sound* sound)
+void* AUD_getPythonFactory(AUD_Sound* sound)
{
if(sound)
{
@@ -259,9 +259,9 @@
return NULL;
}
-AUD_Sound* AUD_getPythonSound(PyObject* sound)
+AUD_Sound* AUD_getPythonSound(void* sound)
{
- Factory* factory = checkFactory(sound);
+ Factory* factory = checkFactory((PyObject *)sound);
if(!factory)
return NULL;
Modified: branches/soc-2012-sushi/intern/audaspace/intern/AUD_C-API.h
===================================================================
--- branches/soc-2012-sushi/intern/audaspace/intern/AUD_C-API.h 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/intern/audaspace/intern/AUD_C-API.h 2012-07-05 13:30:31 UTC (rev 48648)
@@ -29,10 +29,6 @@
#ifndef __AUD_C_API_H__
#define __AUD_C_API_H__
-#ifdef WITH_PYTHON
-#include "Python.h"
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -740,14 +736,14 @@
* \param sound The sound factory.
* \return The python factory.
*/
-extern PyObject* AUD_getPythonFactory(AUD_Sound* sound);
+extern void* AUD_getPythonFactory(AUD_Sound* sound);
/**
* Retrieves the sound factory of a python factory.
* \param sound The python factory.
* \return The sound factory.
*/
-extern AUD_Sound* AUD_getPythonSound(PyObject* sound);
+extern AUD_Sound* AUD_getPythonSound(void* sound);
#endif
#ifdef __cplusplus
Modified: branches/soc-2012-sushi/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/soc-2012-sushi/intern/ghost/GHOST_C-api.h 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/intern/ghost/GHOST_C-api.h 2012-07-05 13:30:31 UTC (rev 48648)
@@ -328,7 +328,8 @@
* @param windowhandle The handle to the window
* @param bitmap The bitmap data for the cursor.
* @param mask The mask data for the cursor.
- * @parm sizex, sizey The size of the cursor
+ * @param sizex The width of the cursor
+ * @param sizey The height of the cursor
* @param hotX The X coordinate of the cursor hotspot.
* @param hotY The Y coordinate of the cursor hotspot.
* @param fg_color, bg_color Colors of the cursor
Modified: branches/soc-2012-sushi/release/scripts/modules/console_shell.py
===================================================================
--- branches/soc-2012-sushi/release/scripts/modules/console_shell.py 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/release/scripts/modules/console_shell.py 2012-07-05 13:30:31 UTC (rev 48648)
@@ -24,8 +24,8 @@
def add_scrollback(text, text_type):
- for l in text.split('\n'):
- bpy.ops.console.scrollback_append(text=l.replace('\t', ' '),
+ for l in text.split("\n"):
+ bpy.ops.console.scrollback_append(text=l.replace("\t", " "),
type=text_type)
@@ -40,7 +40,7 @@
add_scrollback(output, style)
-PROMPT = '$ '
+PROMPT = "$ "
def execute(context):
Modified: branches/soc-2012-sushi/release/scripts/presets/tracking_settings/blurry_footage.py
===================================================================
--- branches/soc-2012-sushi/release/scripts/presets/tracking_settings/blurry_footage.py 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/release/scripts/presets/tracking_settings/blurry_footage.py 2012-07-05 13:30:31 UTC (rev 48648)
@@ -1,8 +1,6 @@
import bpy
settings = bpy.context.edit_movieclip.tracking.settings
-settings.default_tracker = 'Hybrid'
-settings.default_pyramid_levels = 2
settings.default_correlation_min = 0.75
settings.default_pattern_size = 21
settings.default_search_size = 100
Modified: branches/soc-2012-sushi/release/scripts/presets/tracking_settings/blurry_movie.py
===================================================================
--- branches/soc-2012-sushi/release/scripts/presets/tracking_settings/blurry_movie.py 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/release/scripts/presets/tracking_settings/blurry_movie.py 2012-07-05 13:30:31 UTC (rev 48648)
@@ -1,8 +1,6 @@
import bpy
settings = bpy.context.edit_movieclip.tracking.settings
-settings.default_tracker = 'KLT'
-settings.default_pyramid_levels = 4
settings.default_correlation_min = 0.75
settings.default_pattern_size = 11
settings.default_search_size = 202
Modified: branches/soc-2012-sushi/release/scripts/presets/tracking_settings/default.py
===================================================================
--- branches/soc-2012-sushi/release/scripts/presets/tracking_settings/default.py 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/release/scripts/presets/tracking_settings/default.py 2012-07-05 13:30:31 UTC (rev 48648)
@@ -1,8 +1,6 @@
import bpy
settings = bpy.context.edit_movieclip.tracking.settings
-settings.default_tracker = 'Hybrid'
-settings.default_pyramid_levels = 2
settings.default_correlation_min = 0.75
settings.default_pattern_size = 11
settings.default_search_size = 61
Modified: branches/soc-2012-sushi/release/scripts/presets/tracking_settings/fast_motion.py
===================================================================
--- branches/soc-2012-sushi/release/scripts/presets/tracking_settings/fast_motion.py 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/release/scripts/presets/tracking_settings/fast_motion.py 2012-07-05 13:30:31 UTC (rev 48648)
@@ -1,8 +1,6 @@
import bpy
settings = bpy.context.edit_movieclip.tracking.settings
-settings.default_tracker = 'Hybrid'
-settings.default_pyramid_levels = 2
settings.default_correlation_min = 0.7
settings.default_pattern_size = 31
settings.default_search_size = 300
Modified: branches/soc-2012-sushi/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/soc-2012-sushi/release/scripts/startup/bl_operators/clip.py 2012-07-05 13:27:13 UTC (rev 48647)
+++ branches/soc-2012-sushi/release/scripts/startup/bl_operators/clip.py 2012-07-05 13:30:31 UTC (rev 48648)
@@ -105,8 +105,6 @@
search[0] = search[0] * width
search[1] = search[1] * height
- settings.default_tracker = track.tracker
- settings.default_pyramid_levels = track.pyramid_levels
settings.default_correlation_min = track.correlation_min
settings.default_pattern_size = max(pattern[0], pattern[1])
settings.default_search_size = max(search[0], search[1])
@@ -497,7 +495,7 @@
fg = rlayers[0]
fg.name = 'Foreground'
else:
- fg = scene.render.layers.new('Foreground')
+ fg = scene.render.layers.new("Foreground")
fg.use_sky = False
fg.layers = [True] + [False] * 19
@@ -505,7 +503,7 @@
fg.use_pass_vector = True
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list