[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22061] branches/itasc: svn merge -r 21970 :22060 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender
Benoit Bolsee
benoit.bolsee at online.be
Thu Jul 30 19:52:33 CEST 2009
Revision: 22061
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22061
Author: ben2610
Date: 2009-07-30 19:52:33 +0200 (Thu, 30 Jul 2009)
Log Message:
-----------
svn merge -r 21970:22060 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/itasc/intern/CMakeLists.txt
branches/itasc/intern/SConscript
branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp
branches/itasc/release/datafiles/blenderbuttons
branches/itasc/release/io/engine_render_pov.py
branches/itasc/release/ui/buttons_data_lamp.py
branches/itasc/release/ui/buttons_data_modifier.py
branches/itasc/release/ui/buttons_game.py
branches/itasc/release/ui/buttons_material.py
branches/itasc/release/ui/buttons_object.py
branches/itasc/release/ui/buttons_object_constraint.py
branches/itasc/release/ui/buttons_physics_field.py
branches/itasc/release/ui/buttons_physics_fluid.py
branches/itasc/release/ui/buttons_physics_softbody.py
branches/itasc/release/ui/buttons_scene.py
branches/itasc/release/ui/buttons_texture.py
branches/itasc/release/ui/buttons_world.py
branches/itasc/release/ui/space_console.py
branches/itasc/release/ui/space_filebrowser.py
branches/itasc/release/ui/space_image.py
branches/itasc/release/ui/space_info.py
branches/itasc/source/Makefile
branches/itasc/source/blender/blenfont/intern/blf.c
branches/itasc/source/blender/blenfont/intern/blf_glyph.c
branches/itasc/source/blender/blenkernel/BKE_blender.h
branches/itasc/source/blender/blenkernel/BKE_context.h
branches/itasc/source/blender/blenkernel/CMakeLists.txt
branches/itasc/source/blender/blenkernel/SConscript
branches/itasc/source/blender/blenkernel/intern/armature.c
branches/itasc/source/blender/blenkernel/intern/blender.c
branches/itasc/source/blender/blenkernel/intern/context.c
branches/itasc/source/blender/blenkernel/intern/modifier.c
branches/itasc/source/blender/blenkernel/intern/screen.c
branches/itasc/source/blender/blenlib/BLI_kdopbvh.h
branches/itasc/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/itasc/source/blender/blenlib/intern/fileops.c
branches/itasc/source/blender/blenlib/intern/storage.c
branches/itasc/source/blender/blenloader/intern/readfile.c
branches/itasc/source/blender/blenloader/intern/writefile.c
branches/itasc/source/blender/editors/CMakeLists.txt
branches/itasc/source/blender/editors/Makefile
branches/itasc/source/blender/editors/SConscript
branches/itasc/source/blender/editors/animation/anim_ops.c
branches/itasc/source/blender/editors/animation/keyframing.c
branches/itasc/source/blender/editors/armature/editarmature.c
branches/itasc/source/blender/editors/armature/editarmature_sketch.c
branches/itasc/source/blender/editors/curve/editfont.c
branches/itasc/source/blender/editors/datafiles/B.blend.c
branches/itasc/source/blender/editors/datafiles/blenderbuttons.c
branches/itasc/source/blender/editors/include/ED_armature.h
branches/itasc/source/blender/editors/include/ED_screen.h
branches/itasc/source/blender/editors/include/ED_util.h
branches/itasc/source/blender/editors/include/UI_icons.h
branches/itasc/source/blender/editors/include/UI_interface.h
branches/itasc/source/blender/editors/include/UI_view2d.h
branches/itasc/source/blender/editors/interface/interface.c
branches/itasc/source/blender/editors/interface/interface_anim.c
branches/itasc/source/blender/editors/interface/interface_handlers.c
branches/itasc/source/blender/editors/interface/interface_layout.c
branches/itasc/source/blender/editors/interface/interface_regions.c
branches/itasc/source/blender/editors/interface/interface_style.c
branches/itasc/source/blender/editors/interface/interface_templates.c
branches/itasc/source/blender/editors/interface/interface_widgets.c
branches/itasc/source/blender/editors/interface/view2d.c
branches/itasc/source/blender/editors/interface/view2d_ops.c
branches/itasc/source/blender/editors/mesh/editmesh_add.c
branches/itasc/source/blender/editors/mesh/editmesh_loop.c
branches/itasc/source/blender/editors/mesh/editmesh_tools.c
branches/itasc/source/blender/editors/mesh/mesh_ops.c
branches/itasc/source/blender/editors/object/object_edit.c
branches/itasc/source/blender/editors/object/object_intern.h
branches/itasc/source/blender/editors/object/object_ops.c
branches/itasc/source/blender/editors/screen/area.c
branches/itasc/source/blender/editors/screen/screen_edit.c
branches/itasc/source/blender/editors/screen/screen_ops.c
branches/itasc/source/blender/editors/screen/screendump.c
branches/itasc/source/blender/editors/sculpt_paint/paint_image.c
branches/itasc/source/blender/editors/space_action/action_header.c
branches/itasc/source/blender/editors/space_action/space_action.c
branches/itasc/source/blender/editors/space_api/spacetypes.c
branches/itasc/source/blender/editors/space_buttons/buttons_context.c
branches/itasc/source/blender/editors/space_buttons/buttons_header.c
branches/itasc/source/blender/editors/space_buttons/buttons_intern.h
branches/itasc/source/blender/editors/space_buttons/buttons_ops.c
branches/itasc/source/blender/editors/space_buttons/space_buttons.c
branches/itasc/source/blender/editors/space_console/console_intern.h
branches/itasc/source/blender/editors/space_console/console_ops.c
branches/itasc/source/blender/editors/space_console/space_console.c
branches/itasc/source/blender/editors/space_file/file_draw.c
branches/itasc/source/blender/editors/space_file/file_ops.c
branches/itasc/source/blender/editors/space_file/file_panels.c
branches/itasc/source/blender/editors/space_file/filesel.c
branches/itasc/source/blender/editors/space_file/fsmenu.c
branches/itasc/source/blender/editors/space_file/space_file.c
branches/itasc/source/blender/editors/space_graph/graph_buttons.c
branches/itasc/source/blender/editors/space_graph/graph_header.c
branches/itasc/source/blender/editors/space_graph/graph_ops.c
branches/itasc/source/blender/editors/space_graph/space_graph.c
branches/itasc/source/blender/editors/space_image/image_buttons.c
branches/itasc/source/blender/editors/space_image/image_draw.c
branches/itasc/source/blender/editors/space_image/image_header.c
branches/itasc/source/blender/editors/space_image/image_ops.c
branches/itasc/source/blender/editors/space_image/space_image.c
branches/itasc/source/blender/editors/space_info/info_ops.c
branches/itasc/source/blender/editors/space_info/space_info.c
branches/itasc/source/blender/editors/space_logic/logic_buttons.c
branches/itasc/source/blender/editors/space_logic/logic_header.c
branches/itasc/source/blender/editors/space_logic/logic_window.c
branches/itasc/source/blender/editors/space_logic/space_logic.c
branches/itasc/source/blender/editors/space_nla/nla_header.c
branches/itasc/source/blender/editors/space_nla/space_nla.c
branches/itasc/source/blender/editors/space_node/node_draw.c
branches/itasc/source/blender/editors/space_node/node_edit.c
branches/itasc/source/blender/editors/space_node/node_header.c
branches/itasc/source/blender/editors/space_node/node_select.c
branches/itasc/source/blender/editors/space_node/node_state.c
branches/itasc/source/blender/editors/space_node/space_node.c
branches/itasc/source/blender/editors/space_outliner/outliner.c
branches/itasc/source/blender/editors/space_outliner/outliner_header.c
branches/itasc/source/blender/editors/space_outliner/outliner_intern.h
branches/itasc/source/blender/editors/space_outliner/outliner_ops.c
branches/itasc/source/blender/editors/space_outliner/space_outliner.c
branches/itasc/source/blender/editors/space_sequencer/sequencer_add.c
branches/itasc/source/blender/editors/space_sequencer/sequencer_ops.c
branches/itasc/source/blender/editors/space_sequencer/space_sequencer.c
branches/itasc/source/blender/editors/space_text/space_text.c
branches/itasc/source/blender/editors/space_text/text_ops.c
branches/itasc/source/blender/editors/space_time/space_time.c
branches/itasc/source/blender/editors/space_time/time_header.c
branches/itasc/source/blender/editors/space_view3d/SConscript
branches/itasc/source/blender/editors/space_view3d/drawobject.c
branches/itasc/source/blender/editors/space_view3d/space_view3d.c
branches/itasc/source/blender/editors/space_view3d/view3d_edit.c
branches/itasc/source/blender/editors/space_view3d/view3d_header.c
branches/itasc/source/blender/editors/space_view3d/view3d_intern.h
branches/itasc/source/blender/editors/space_view3d/view3d_ops.c
branches/itasc/source/blender/editors/space_view3d/view3d_select.c
branches/itasc/source/blender/editors/space_view3d/view3d_toolbar.c
branches/itasc/source/blender/editors/transform/transform.c
branches/itasc/source/blender/editors/transform/transform_conversions.c
branches/itasc/source/blender/editors/transform/transform_input.c
branches/itasc/source/blender/editors/transform/transform_manipulator.c
branches/itasc/source/blender/editors/util/editmode_undo.c
branches/itasc/source/blender/editors/util/undo.c
branches/itasc/source/blender/editors/util/util_intern.h
branches/itasc/source/blender/editors/uvedit/uvedit_ops.c
branches/itasc/source/blender/makesdna/DNA_anim_types.h
branches/itasc/source/blender/makesdna/DNA_meta_types.h
branches/itasc/source/blender/makesdna/DNA_modifier_types.h
branches/itasc/source/blender/makesdna/DNA_space_types.h
branches/itasc/source/blender/makesdna/DNA_view2d_types.h
branches/itasc/source/blender/makesdna/DNA_windowmanager_types.h
branches/itasc/source/blender/makesdna/intern/makesdna.c
branches/itasc/source/blender/makesrna/RNA_access.h
branches/itasc/source/blender/makesrna/intern/makesrna.c
branches/itasc/source/blender/makesrna/intern/rna_brush.c
branches/itasc/source/blender/makesrna/intern/rna_internal.h
branches/itasc/source/blender/makesrna/intern/rna_lamp.c
branches/itasc/source/blender/makesrna/intern/rna_material.c
branches/itasc/source/blender/makesrna/intern/rna_meta.c
branches/itasc/source/blender/makesrna/intern/rna_modifier.c
branches/itasc/source/blender/makesrna/intern/rna_object.c
branches/itasc/source/blender/makesrna/intern/rna_space.c
branches/itasc/source/blender/makesrna/intern/rna_ui.c
branches/itasc/source/blender/makesrna/intern/rna_userdef.c
branches/itasc/source/blender/makesrna/intern/rna_world.c
branches/itasc/source/blender/python/intern/bpy_operator.c
branches/itasc/source/blender/python/intern/bpy_rna.c
branches/itasc/source/blender/python/intern/bpy_rna.h
branches/itasc/source/blender/windowmanager/WM_api.h
branches/itasc/source/blender/windowmanager/WM_types.h
branches/itasc/source/blender/windowmanager/intern/wm.c
branches/itasc/source/blender/windowmanager/intern/wm_cursors.c
branches/itasc/source/blender/windowmanager/intern/wm_event_system.c
branches/itasc/source/blender/windowmanager/intern/wm_keymap.c
branches/itasc/source/blender/windowmanager/intern/wm_operators.c
branches/itasc/source/blender/windowmanager/wm_event_types.h
branches/itasc/source/creator/CMakeLists.txt
Added Paths:
-----------
branches/itasc/intern/smoke/
branches/itasc/intern/smoke/CMakeLists.txt
branches/itasc/intern/smoke/SConscript
branches/itasc/intern/smoke/extern/
branches/itasc/intern/smoke/extern/smoke_API.h
branches/itasc/intern/smoke/intern/
branches/itasc/intern/smoke/intern/EIGENVALUE_HELPER.h
branches/itasc/intern/smoke/intern/FFT_NOISE.h
branches/itasc/intern/smoke/intern/FLUID_3D.cpp
branches/itasc/intern/smoke/intern/FLUID_3D.h
branches/itasc/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/itasc/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/itasc/intern/smoke/intern/IMAGE.h
branches/itasc/intern/smoke/intern/INTERPOLATE.h
branches/itasc/intern/smoke/intern/LICENSE.txt
branches/itasc/intern/smoke/intern/LU_HELPER.h
branches/itasc/intern/smoke/intern/MERSENNETWISTER.h
branches/itasc/intern/smoke/intern/Makefile.FFT
branches/itasc/intern/smoke/intern/Makefile.cygwin
branches/itasc/intern/smoke/intern/Makefile.linux
branches/itasc/intern/smoke/intern/Makefile.mac
branches/itasc/intern/smoke/intern/OBSTACLE.h
branches/itasc/intern/smoke/intern/SPHERE.cpp
branches/itasc/intern/smoke/intern/SPHERE.h
branches/itasc/intern/smoke/intern/VEC3.h
branches/itasc/intern/smoke/intern/WAVELET_NOISE.h
branches/itasc/intern/smoke/intern/WTURBULENCE.cpp
branches/itasc/intern/smoke/intern/WTURBULENCE.h
branches/itasc/intern/smoke/intern/main.cpp.back
branches/itasc/intern/smoke/intern/smoke_API.cpp
branches/itasc/intern/smoke/intern/tnt/
branches/itasc/intern/smoke/intern/tnt/jama_eig.h
branches/itasc/intern/smoke/intern/tnt/jama_lu.h
branches/itasc/intern/smoke/intern/tnt/tnt.h
branches/itasc/intern/smoke/intern/tnt/tnt_array1d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array1d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_array2d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array2d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_array3d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array3d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_cmat.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array1d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array2d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array3d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_i_refvec.h
branches/itasc/intern/smoke/intern/tnt/tnt_math_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
branches/itasc/intern/smoke/intern/tnt/tnt_stopwatch.h
branches/itasc/intern/smoke/intern/tnt/tnt_subscript.h
branches/itasc/intern/smoke/intern/tnt/tnt_vec.h
branches/itasc/intern/smoke/intern/tnt/tnt_version.h
branches/itasc/release/ui/buttons_data_metaball.py
branches/itasc/source/blender/blenkernel/BKE_sketch.h
branches/itasc/source/blender/blenkernel/BKE_smoke.h
branches/itasc/source/blender/blenkernel/intern/sketch.c
branches/itasc/source/blender/blenkernel/intern/smoke.c
branches/itasc/source/blender/editors/include/ED_mball.h
branches/itasc/source/blender/editors/metaball/
branches/itasc/source/blender/editors/metaball/Makefile
branches/itasc/source/blender/editors/metaball/SConscript
branches/itasc/source/blender/editors/metaball/editmball.c
branches/itasc/source/blender/editors/metaball/mball_intern.h
branches/itasc/source/blender/editors/metaball/mball_ops.c
branches/itasc/source/blender/makesdna/DNA_smoke_types.h
branches/itasc/source/blender/makesrna/intern/rna_smoke.c
Removed Paths:
-------------
branches/itasc/intern/smoke/CMakeLists.txt
branches/itasc/intern/smoke/SConscript
branches/itasc/intern/smoke/extern/
branches/itasc/intern/smoke/extern/smoke_API.h
branches/itasc/intern/smoke/intern/
branches/itasc/intern/smoke/intern/EIGENVALUE_HELPER.h
branches/itasc/intern/smoke/intern/FFT_NOISE.h
branches/itasc/intern/smoke/intern/FLUID_3D.cpp
branches/itasc/intern/smoke/intern/FLUID_3D.h
branches/itasc/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/itasc/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/itasc/intern/smoke/intern/IMAGE.h
branches/itasc/intern/smoke/intern/INTERPOLATE.h
branches/itasc/intern/smoke/intern/LICENSE.txt
branches/itasc/intern/smoke/intern/LU_HELPER.h
branches/itasc/intern/smoke/intern/MERSENNETWISTER.h
branches/itasc/intern/smoke/intern/Makefile.FFT
branches/itasc/intern/smoke/intern/Makefile.cygwin
branches/itasc/intern/smoke/intern/Makefile.linux
branches/itasc/intern/smoke/intern/Makefile.mac
branches/itasc/intern/smoke/intern/OBSTACLE.h
branches/itasc/intern/smoke/intern/SPHERE.cpp
branches/itasc/intern/smoke/intern/SPHERE.h
branches/itasc/intern/smoke/intern/VEC3.h
branches/itasc/intern/smoke/intern/WAVELET_NOISE.h
branches/itasc/intern/smoke/intern/WTURBULENCE.cpp
branches/itasc/intern/smoke/intern/WTURBULENCE.h
branches/itasc/intern/smoke/intern/main.cpp.back
branches/itasc/intern/smoke/intern/smoke_API.cpp
branches/itasc/intern/smoke/intern/tnt/
branches/itasc/intern/smoke/intern/tnt/jama_eig.h
branches/itasc/intern/smoke/intern/tnt/jama_lu.h
branches/itasc/intern/smoke/intern/tnt/tnt.h
branches/itasc/intern/smoke/intern/tnt/tnt_array1d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array1d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_array2d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array2d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_array3d.h
branches/itasc/intern/smoke/intern/tnt/tnt_array3d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_cmat.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array1d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array2d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array3d.h
branches/itasc/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_i_refvec.h
branches/itasc/intern/smoke/intern/tnt/tnt_math_utils.h
branches/itasc/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
branches/itasc/intern/smoke/intern/tnt/tnt_stopwatch.h
branches/itasc/intern/smoke/intern/tnt/tnt_subscript.h
branches/itasc/intern/smoke/intern/tnt/tnt_vec.h
branches/itasc/intern/smoke/intern/tnt/tnt_version.h
branches/itasc/source/blender/editors/metaball/Makefile
branches/itasc/source/blender/editors/metaball/SConscript
branches/itasc/source/blender/editors/metaball/editmball.c
branches/itasc/source/blender/editors/metaball/mball_intern.h
branches/itasc/source/blender/editors/metaball/mball_ops.c
Property Changed:
----------------
branches/itasc/release/io/engine_render_pov.py
Modified: branches/itasc/intern/CMakeLists.txt
===================================================================
--- branches/itasc/intern/CMakeLists.txt 2009-07-30 17:05:16 UTC (rev 22060)
+++ branches/itasc/intern/CMakeLists.txt 2009-07-30 17:52:33 UTC (rev 22061)
@@ -36,6 +36,7 @@
ADD_SUBDIRECTORY(itasc)
ADD_SUBDIRECTORY(boolop)
ADD_SUBDIRECTORY(opennl)
+ADD_SUBDIRECTORY(smoke)
IF(WITH_ELBEEM)
ADD_SUBDIRECTORY(elbeem)
Modified: branches/itasc/intern/SConscript
===================================================================
--- branches/itasc/intern/SConscript 2009-07-30 17:05:16 UTC (rev 22060)
+++ branches/itasc/intern/SConscript 2009-07-30 17:52:33 UTC (rev 22061)
@@ -12,7 +12,8 @@
'iksolver/SConscript',
'itasc/SConscript',
'boolop/SConscript',
- 'opennl/SConscript'])
+ 'opennl/SConscript',
+ 'smoke/SConscript'])
# NEW_CSG was intended for intern/csg, but
# getting it to compile is difficult
Modified: branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp 2009-07-30 17:05:16 UTC (rev 22060)
+++ branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp 2009-07-30 17:52:33 UTC (rev 22061)
@@ -534,11 +534,28 @@
window, data);
}
} else if (((Atom)xcme.data.l[0]) == m_wm_take_focus) {
+ XWindowAttributes attr;
+ Window fwin;
+ int revert_to;
+
/* as ICCCM say, we need reply this event
* with a SetInputFocus, the data[1] have
* the valid timestamp (send by the wm).
+ *
+ * Some WM send this event before the
+ * window is really mapped (for example
+ * change from virtual desktop), so we need
+ * to be sure that our windows is mapped
+ * or this call fail and close blender.
*/
- XSetInputFocus(m_display, xcme.window, RevertToParent, xcme.data.l[1]);
+ if (XGetWindowAttributes(m_display, xcme.window, &attr) == True) {
+ if (XGetInputFocus(m_display, &fwin, &revert_to) == True) {
+ if (attr.map_state == IsViewable) {
+ if (fwin != xcme.window)
+ XSetInputFocus(m_display, xcme.window, RevertToParent, xcme.data.l[1]);
+ }
+ }
+ }
} else {
/* Unknown client message, ignore */
}
Copied: branches/itasc/intern/smoke (from rev 22060, branches/blender2.5/blender/intern/smoke)
Deleted: branches/itasc/intern/smoke/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/intern/smoke/CMakeLists.txt 2009-07-30 17:05:16 UTC (rev 22060)
+++ branches/itasc/intern/smoke/CMakeLists.txt 2009-07-30 17:52:33 UTC (rev 22061)
@@ -1,38 +0,0 @@
-# $Id$
-# ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Daniel Genrich
-#
-# ***** END GPL LICENSE BLOCK *****
-
-SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
-# ${FFTW3_INC}
-
-FILE(GLOB SRC intern/*.cpp)
-
-IF(WITH_OPENMP)
- ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-
-BLENDERLIB(bf_smoke "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
Copied: branches/itasc/intern/smoke/CMakeLists.txt (from rev 22060, branches/blender2.5/blender/intern/smoke/CMakeLists.txt)
===================================================================
--- branches/itasc/intern/smoke/CMakeLists.txt (rev 0)
+++ branches/itasc/intern/smoke/CMakeLists.txt 2009-07-30 17:52:33 UTC (rev 22061)
@@ -0,0 +1,38 @@
+# $Id$
+# ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Daniel Genrich
+#
+# ***** END GPL LICENSE BLOCK *****
+
+SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
+# ${FFTW3_INC}
+
+FILE(GLOB SRC intern/*.cpp)
+
+IF(WITH_OPENMP)
+ ADD_DEFINITIONS(-DPARALLEL=1)
+ENDIF(WITH_OPENMP)
+
+
+BLENDERLIB(bf_smoke "${SRC}" "${INC}")
+#, libtype='blender', priority = 0 )
Deleted: branches/itasc/intern/smoke/SConscript
===================================================================
--- branches/blender2.5/blender/intern/smoke/SConscript 2009-07-30 17:05:16 UTC (rev 22060)
+++ branches/itasc/intern/smoke/SConscript 2009-07-30 17:52:33 UTC (rev 22061)
@@ -1,15 +0,0 @@
-#!/usr/bin/python
-Import ('env')
-
-sources = env.Glob('intern/*.cpp')
-
-defs = ''
-
-if env['WITH_BF_OPENMP']:
- defs += ' PARALLEL=1'
-
-incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC']
-incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc '
-# incs += env['BF_FFTW3_INC']
-
-env.BlenderLib ('bf_smoke', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
Copied: branches/itasc/intern/smoke/SConscript (from rev 22060, branches/blender2.5/blender/intern/smoke/SConscript)
===================================================================
--- branches/itasc/intern/smoke/SConscript (rev 0)
+++ branches/itasc/intern/smoke/SConscript 2009-07-30 17:52:33 UTC (rev 22061)
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('intern/*.cpp')
+
+defs = ''
+
+if env['WITH_BF_OPENMP']:
+ defs += ' PARALLEL=1'
+
+incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC']
+incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc '
+# incs += env['BF_FFTW3_INC']
+
+env.BlenderLib ('bf_smoke', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
Copied: branches/itasc/intern/smoke/extern (from rev 22060, branches/blender2.5/blender/intern/smoke/extern)
Deleted: branches/itasc/intern/smoke/extern/smoke_API.h
===================================================================
--- branches/blender2.5/blender/intern/smoke/extern/smoke_API.h 2009-07-30 17:05:16 UTC (rev 22060)
+++ branches/itasc/intern/smoke/extern/smoke_API.h 2009-07-30 17:52:33 UTC (rev 22061)
@@ -1,62 +0,0 @@
-/**
- * $Id$
- *
- * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2009 by Daniel Genrich
- * All rights reserved.
- *
- * Contributor(s): None
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef SMOKE_API_H_
-#define SMOKE_API_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct FLUID_3D *smoke_init(int *res, int amplify, float *p0, float *p1, float dt);
-void smoke_free(struct FLUID_3D *fluid);
-
-void smoke_initBlenderRNA(struct FLUID_3D *fluid, float *alpha, float *beta);
-
-void smoke_step(struct FLUID_3D *fluid);
-
-float *smoke_get_density(struct FLUID_3D *fluid);
-float *smoke_get_bigdensity(struct FLUID_3D *fluid);
-float *smoke_get_heat(struct FLUID_3D *fluid);
-float *smoke_get_velocity_x(struct FLUID_3D *fluid);
-float *smoke_get_velocity_y(struct FLUID_3D *fluid);
-float *smoke_get_velocity_z(struct FLUID_3D *fluid);
-
-unsigned char *smoke_get_obstacle(struct FLUID_3D *fluid);
-
-size_t smoke_get_index(int x, int max_x, int y, int max_y, int z, int max_z);
-size_t smoke_get_index2d(int x, int max_x, int y, int max_y, int z, int max_z);
-
-void smoke_set_noise(struct FLUID_3D *fluid, int type);
-
-void smoke_get_bigres(struct FLUID_3D *fluid, int *res);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SMOKE_API_H_ */
Copied: branches/itasc/intern/smoke/extern/smoke_API.h (from rev 22060, branches/blender2.5/blender/intern/smoke/extern/smoke_API.h)
===================================================================
--- branches/itasc/intern/smoke/extern/smoke_API.h (rev 0)
+++ branches/itasc/intern/smoke/extern/smoke_API.h 2009-07-30 17:52:33 UTC (rev 22061)
@@ -0,0 +1,62 @@
+/**
+ * $Id$
+ *
+ * ***** 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
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list