[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47100] branches/soc-2011-tomato: svn merge ^/trunk/blender -r47070:47099
Campbell Barton
ideasman42 at gmail.com
Mon May 28 06:48:43 CEST 2012
Revision: 47100
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47100
Author: campbellbarton
Date: 2012-05-28 04:48:42 +0000 (Mon, 28 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47070:47099
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47070
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/intern/ghost/test/multitest/MultiTest.c
branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/soc-2011-tomato/release/plugins/sequence/gamma.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/bullet.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/group.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c
branches/soc-2011-tomato/source/blender/blenlib/intern/edgehash.c
branches/soc-2011-tomato/source/blender/blenlib/intern/noise.c
branches/soc-2011-tomato/source/blender/blenlib/intern/string_utf8.c
branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c
branches/soc-2011-tomato/source/blender/blenloader/intern/runtime.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2011-tomato/source/blender/collada/SceneExporter.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-tomato/source/blender/editors/animation/drivers.c
branches/soc-2011-tomato/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_edit.c
branches/soc-2011-tomato/source/blender/editors/armature/poselib.c
branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/datafiles/Bfont.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/jp2.c
branches/soc-2011-tomato/source/blender/imbuf/intern/jpeg.c
branches/soc-2011-tomato/source/blender/imbuf/intern/targa.c
branches/soc-2011-tomato/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2011-tomato/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/soc-2011-tomato/source/tests/CMakeLists.txt
branches/soc-2011-tomato/source/tools/uncrustify.cfg
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-47070
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-47099
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-05-28 01:29:49 UTC (rev 47099)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-05-28 04:48:42 UTC (rev 47100)
@@ -1,4 +1,3 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -559,7 +558,7 @@
endif()
mark_as_advanced(FFMPEG)
- set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+ set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/ffmpeg)
mark_as_advanced(FFMPEG_LIBRARIES)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
@@ -1107,7 +1106,7 @@
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
- set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
+ set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
if(WITH_MINGW64)
set(FFMPEG_LIBRARIES avcodec.dll avformat.dll avdevice.dll avutil.dll swscale.dll swresample.dll)
else()
Modified: branches/soc-2011-tomato/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-05-28 01:29:49 UTC (rev 47099)
+++ branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-05-28 04:48:42 UTC (rev 47100)
@@ -1,6 +1,28 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
-
# foo_bar.spam --> foo_barMySuffix.spam
macro(file_suffix
file_name_new file_name file_suffix
Modified: branches/soc-2011-tomato/intern/ghost/test/multitest/MultiTest.c
===================================================================
--- branches/soc-2011-tomato/intern/ghost/test/multitest/MultiTest.c 2012-05-28 01:29:49 UTC (rev 47099)
+++ branches/soc-2011-tomato/intern/ghost/test/multitest/MultiTest.c 2012-05-28 04:48:42 UTC (rev 47100)
@@ -656,7 +656,8 @@
int size[2];
} ExtraWindow;
-static void extrawindow_do_draw(ExtraWindow *ew) {
+static void extrawindow_do_draw(ExtraWindow *ew)
+{
GHOST_ActivateWindowDrawingContext(ew->win);
glClearColor(1, 1, 1, 1);
@@ -668,7 +669,8 @@
GHOST_SwapWindowBuffers(ew->win);
}
-static void extrawindow_do_reshape(ExtraWindow *ew) {
+static void extrawindow_do_reshape(ExtraWindow *ew)
+{
GHOST_RectangleHandle bounds = GHOST_GetClientBounds(ew->win);
GHOST_ActivateWindowDrawingContext(ew->win);
@@ -687,7 +689,8 @@
glLoadIdentity();
}
-static void extrawindow_do_key(ExtraWindow *ew, GHOST_TKey key, int press) {
+static void extrawindow_do_key(ExtraWindow *ew, GHOST_TKey key, int press)
+{
switch (key) {
case GHOST_kKeyE:
if (press)
@@ -696,7 +699,8 @@
}
}
-static void extrawindow_spin_cursor(ExtraWindow *ew, GHOST_TUns64 time) {
+static void extrawindow_spin_cursor(ExtraWindow *ew, GHOST_TUns64 time)
+{
GHOST_TUns8 bitmap[16][2];
GHOST_TUns8 mask[16][2];
double ftime = (double) ((GHOST_TInt64) time) / 1000;
@@ -728,7 +732,8 @@
GHOST_SetCustomCursorShape(ew->win, bitmap, mask, 0, 0);
}
-static void extrawindow_handle(void *priv, GHOST_EventHandle evt) {
+static void extrawindow_handle(void *priv, GHOST_EventHandle evt)
+{
ExtraWindow *ew = priv;
GHOST_TEventType type = GHOST_GetEventType(evt);
char buf[256];
@@ -785,7 +790,8 @@
}
}
-void extrawindow_free(ExtraWindow *ew) {
+void extrawindow_free(ExtraWindow *ew)
+{
GHOST_SystemHandle sys = multitestapp_get_system(ew->app);
windowdata_free(GHOST_GetWindowUserData(ew->win));
@@ -806,7 +812,8 @@
int exit;
};
-static int multitest_event_handler(GHOST_EventHandle evt, GHOST_TUserDataPtr data) {
+static int multitest_event_handler(GHOST_EventHandle evt, GHOST_TUserDataPtr data)
+{
MultiTestApp *app = data;
GHOST_WindowHandle win;
@@ -876,12 +883,14 @@
return app->sys;
}
-void multitestapp_free_extrawindow(MultiTestApp *app) {
+void multitestapp_free_extrawindow(MultiTestApp *app)
+{
extrawindow_free(app->extra);
app->extra = NULL;
}
-void multitestapp_toggle_extra_window(MultiTestApp *app) {
+void multitestapp_toggle_extra_window(MultiTestApp *app)
+{
if (app->extra) {
multitestapp_free_extrawindow(app);
}
Modified: branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D_STATIC.cpp
===================================================================
--- branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D_STATIC.cpp 2012-05-28 01:29:49 UTC (rev 47099)
+++ branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D_STATIC.cpp 2012-05-28 04:48:42 UTC (rev 47100)
@@ -153,9 +153,13 @@
index = x + y * res[0];
field[index] = field[index + 2 * slabSize];
/* only allow outwards flux */
- if(field[index]>0.) field[index] = 0.;
- index += slabSize;
- if(field[index]>0.) field[index] = 0.;
+
+ // DG: Disable this for z-axis.
+ // The problem is that smoke somehow gets sucked in again
+ // from the TOP slab when this is enabled
+ // if(field[index]>0.) field[index] = 0.;
+ // index += slabSize;
+ // if(field[index]>0.) field[index] = 0.;
}
}
Modified: branches/soc-2011-tomato/release/plugins/sequence/gamma.c
===================================================================
--- branches/soc-2011-tomato/release/plugins/sequence/gamma.c 2012-05-28 01:29:49 UTC (rev 47099)
+++ branches/soc-2011-tomato/release/plugins/sequence/gamma.c 2012-05-28 04:48:42 UTC (rev 47100)
@@ -176,8 +176,8 @@
o[l]=CLAMP(i[l],0.f,1.f);
o[3]=1.0;
}
- i+=4;
- o+=4;
+ i += 4;
+ o += 4;
}
}
}
Modified: branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c 2012-05-28 01:29:49 UTC (rev 47099)
+++ branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c 2012-05-28 04:48:42 UTC (rev 47100)
@@ -154,7 +154,7 @@
/* check if we already load this font. */
i = blf_search(name);
if (i >= 0) {
- /*font= global_font[i];*/ /*UNUSED*/
+ /*font = global_font[i];*/ /*UNUSED*/
return i;
}
@@ -237,7 +237,7 @@
i = blf_search(name);
if (i >= 0) {
- /*font= global_font[i];*/ /*UNUSED*/
+ /*font = global_font[i];*/ /*UNUSED*/
return i;
}
Modified: branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c 2012-05-28 01:29:49 UTC (rev 47099)
+++ branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c 2012-05-28 04:48:42 UTC (rev 47100)
@@ -132,7 +132,7 @@
_g = blf_glyph_add(_font, \
FT_Get_Char_Index((_font)->face, _c), _c); \
} \
- } \
+ } (void)0
#define BLF_KERNING_VARS(_font, _has_kerning, _kern_mode) \
@@ -155,7 +155,7 @@
_pen_x += delta.x >> 6; \
} \
} \
-} \
+} (void)0
void blf_font_draw(FontBLF *font, const char *str, unsigned int len)
{
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c 2012-05-28 01:29:49 UTC (rev 47099)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c 2012-05-28 04:48:42 UTC (rev 47100)
@@ -744,7 +744,7 @@
for (id = first; id; id = id->next) { \
AnimData *adt = BKE_animdata_from_id(id); \
if (adt) func(id, adt, user_data); \
- }
+ } (void)0
/* "embedded" nodetree cases (i.e. scene/material/texture->nodetree) */
#define ANIMDATA_NODETREE_IDS_CB(first, NtId_Type) \
@@ -756,7 +756,7 @@
if (adt2) func(id, adt2, user_data); \
} \
if (adt) func(id, adt, user_data); \
- }
+ } (void)0
/* nodes */
ANIMDATA_IDS_CB(mainptr->nodetree.first);
@@ -828,7 +828,7 @@
for (id = first; id; id = id->next) { \
AnimData *adt = BKE_animdata_from_id(id); \
BKE_animdata_fix_paths_rename(id, adt, ref_id, prefix, oldName, newName, 0, 0, 1); \
- }
+ } (void)0
/* another version of this macro for nodetrees */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list