[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45854] branches/smoke2: Merge with trunk revision45747 - revision45853
Daniel Genrich
daniel.genrich at gmx.net
Sun Apr 22 21:20:23 CEST 2012
Revision: 45854
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45854
Author: genscher
Date: 2012-04-22 19:20:22 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
Merge with trunk revision45747 - revision45853
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45747
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45853
Modified Paths:
--------------
branches/smoke2/CMakeLists.txt
branches/smoke2/build_files/cmake/macros.cmake
branches/smoke2/doc/python_api/sphinx_doc_gen.py
branches/smoke2/intern/cycles/render/film.cpp
branches/smoke2/intern/elbeem/intern/ntl_world.cpp
branches/smoke2/intern/elbeem/intern/solver_init.cpp
branches/smoke2/intern/opennl/CMakeLists.txt
branches/smoke2/release/scripts/startup/bl_operators/mesh.py
branches/smoke2/release/scripts/startup/bl_operators/presets.py
branches/smoke2/release/scripts/startup/bl_ui/properties_game.py
branches/smoke2/release/scripts/startup/bl_ui/properties_particle.py
branches/smoke2/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/smoke2/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/smoke2/source/blender/blenkernel/BKE_blender.h
branches/smoke2/source/blender/blenkernel/BKE_mesh.h
branches/smoke2/source/blender/blenkernel/BKE_particle.h
branches/smoke2/source/blender/blenkernel/BKE_pointcache.h
branches/smoke2/source/blender/blenkernel/BKE_subsurf.h
branches/smoke2/source/blender/blenkernel/intern/CCGSubSurf.c
branches/smoke2/source/blender/blenkernel/intern/DerivedMesh.c
branches/smoke2/source/blender/blenkernel/intern/action.c
branches/smoke2/source/blender/blenkernel/intern/anim.c
branches/smoke2/source/blender/blenkernel/intern/boids.c
branches/smoke2/source/blender/blenkernel/intern/bvhutils.c
branches/smoke2/source/blender/blenkernel/intern/cdderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/cloth.c
branches/smoke2/source/blender/blenkernel/intern/collision.c
branches/smoke2/source/blender/blenkernel/intern/customdata.c
branches/smoke2/source/blender/blenkernel/intern/depsgraph.c
branches/smoke2/source/blender/blenkernel/intern/dynamicpaint.c
branches/smoke2/source/blender/blenkernel/intern/editderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/effect.c
branches/smoke2/source/blender/blenkernel/intern/image.c
branches/smoke2/source/blender/blenkernel/intern/implicit.c
branches/smoke2/source/blender/blenkernel/intern/key.c
branches/smoke2/source/blender/blenkernel/intern/mesh.c
branches/smoke2/source/blender/blenkernel/intern/mesh_validate.c
branches/smoke2/source/blender/blenkernel/intern/modifier.c
branches/smoke2/source/blender/blenkernel/intern/multires.c
branches/smoke2/source/blender/blenkernel/intern/object.c
branches/smoke2/source/blender/blenkernel/intern/paint.c
branches/smoke2/source/blender/blenkernel/intern/particle.c
branches/smoke2/source/blender/blenkernel/intern/particle_system.c
branches/smoke2/source/blender/blenkernel/intern/pointcache.c
branches/smoke2/source/blender/blenkernel/intern/seqeffects.c
branches/smoke2/source/blender/blenkernel/intern/sequencer.c
branches/smoke2/source/blender/blenkernel/intern/shrinkwrap.c
branches/smoke2/source/blender/blenkernel/intern/softbody.c
branches/smoke2/source/blender/blenkernel/intern/subsurf_ccg.c
branches/smoke2/source/blender/blenkernel/intern/text.c
branches/smoke2/source/blender/blenkernel/intern/unit.c
branches/smoke2/source/blender/blenkernel/intern/writeffmpeg.c
branches/smoke2/source/blender/blenkernel/intern/writeframeserver.c
branches/smoke2/source/blender/blenlib/BLI_pbvh.h
branches/smoke2/source/blender/blenlib/BLI_scanfill.h
branches/smoke2/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/smoke2/source/blender/blenlib/intern/BLI_kdtree.c
branches/smoke2/source/blender/blenlib/intern/fileops.c
branches/smoke2/source/blender/blenlib/intern/fnmatch.c
branches/smoke2/source/blender/blenlib/intern/math_color_inline.c
branches/smoke2/source/blender/blenlib/intern/math_geom.c
branches/smoke2/source/blender/blenlib/intern/pbvh.c
branches/smoke2/source/blender/blenlib/intern/rand.c
branches/smoke2/source/blender/blenlib/intern/scanfill.c
branches/smoke2/source/blender/blenlib/intern/storage.c
branches/smoke2/source/blender/blenloader/intern/readfile.c
branches/smoke2/source/blender/blenloader/intern/writefile.c
branches/smoke2/source/blender/bmesh/bmesh.h
branches/smoke2/source/blender/bmesh/intern/bmesh_construct.c
branches/smoke2/source/blender/bmesh/intern/bmesh_core.c
branches/smoke2/source/blender/bmesh/intern/bmesh_interp.c
branches/smoke2/source/blender/bmesh/intern/bmesh_iterators.c
branches/smoke2/source/blender/bmesh/intern/bmesh_iterators.h
branches/smoke2/source/blender/bmesh/intern/bmesh_iterators_inline.h
branches/smoke2/source/blender/bmesh/intern/bmesh_marking.c
branches/smoke2/source/blender/bmesh/intern/bmesh_marking.h
branches/smoke2/source/blender/bmesh/intern/bmesh_mesh.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mesh.h
branches/smoke2/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mesh_validate.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mods.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mods.h
branches/smoke2/source/blender/bmesh/intern/bmesh_opdefines.c
branches/smoke2/source/blender/bmesh/intern/bmesh_operators.c
branches/smoke2/source/blender/bmesh/intern/bmesh_operators_private.h
branches/smoke2/source/blender/bmesh/intern/bmesh_polygon.c
branches/smoke2/source/blender/bmesh/intern/bmesh_polygon.h
branches/smoke2/source/blender/bmesh/intern/bmesh_private.h
branches/smoke2/source/blender/bmesh/intern/bmesh_queries.c
branches/smoke2/source/blender/bmesh/intern/bmesh_queries.h
branches/smoke2/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/smoke2/source/blender/bmesh/operators/bmo_bevel.c
branches/smoke2/source/blender/bmesh/operators/bmo_connect.c
branches/smoke2/source/blender/bmesh/operators/bmo_create.c
branches/smoke2/source/blender/bmesh/operators/bmo_dissolve.c
branches/smoke2/source/blender/bmesh/operators/bmo_dupe.c
branches/smoke2/source/blender/bmesh/operators/bmo_edgesplit.c
branches/smoke2/source/blender/bmesh/operators/bmo_extrude.c
branches/smoke2/source/blender/bmesh/operators/bmo_inset.c
branches/smoke2/source/blender/bmesh/operators/bmo_join_triangles.c
branches/smoke2/source/blender/bmesh/operators/bmo_mirror.c
branches/smoke2/source/blender/bmesh/operators/bmo_primitive.c
branches/smoke2/source/blender/bmesh/operators/bmo_removedoubles.c
branches/smoke2/source/blender/bmesh/operators/bmo_slide.c
branches/smoke2/source/blender/bmesh/operators/bmo_subdivide.c
branches/smoke2/source/blender/bmesh/operators/bmo_triangulate.c
branches/smoke2/source/blender/bmesh/operators/bmo_utils.c
branches/smoke2/source/blender/bmesh/tools/BME_bevel.c
branches/smoke2/source/blender/editors/armature/meshlaplacian.c
branches/smoke2/source/blender/editors/curve/editcurve.c
branches/smoke2/source/blender/editors/include/ED_mesh.h
branches/smoke2/source/blender/editors/include/ED_numinput.h
branches/smoke2/source/blender/editors/interface/interface_handlers.c
branches/smoke2/source/blender/editors/interface/interface_ops.c
branches/smoke2/source/blender/editors/interface/interface_templates.c
branches/smoke2/source/blender/editors/interface/interface_utils.c
branches/smoke2/source/blender/editors/interface/view2d.c
branches/smoke2/source/blender/editors/mesh/editface.c
branches/smoke2/source/blender/editors/mesh/editmesh_bvh.c
branches/smoke2/source/blender/editors/mesh/editmesh_bvh.h
branches/smoke2/source/blender/editors/mesh/editmesh_knife.c
branches/smoke2/source/blender/editors/mesh/editmesh_loopcut.c
branches/smoke2/source/blender/editors/mesh/editmesh_rip.c
branches/smoke2/source/blender/editors/mesh/editmesh_select.c
branches/smoke2/source/blender/editors/mesh/editmesh_slide.c
branches/smoke2/source/blender/editors/mesh/editmesh_tools.c
branches/smoke2/source/blender/editors/mesh/editmesh_utils.c
branches/smoke2/source/blender/editors/mesh/mesh_data.c
branches/smoke2/source/blender/editors/mesh/mesh_intern.h
branches/smoke2/source/blender/editors/mesh/mesh_navmesh.c
branches/smoke2/source/blender/editors/mesh/mesh_ops.c
branches/smoke2/source/blender/editors/mesh/meshtools.c
branches/smoke2/source/blender/editors/object/object_bake.c
branches/smoke2/source/blender/editors/object/object_hook.c
branches/smoke2/source/blender/editors/object/object_relations.c
branches/smoke2/source/blender/editors/object/object_select.c
branches/smoke2/source/blender/editors/object/object_transform.c
branches/smoke2/source/blender/editors/object/object_vgroup.c
branches/smoke2/source/blender/editors/physics/particle_edit.c
branches/smoke2/source/blender/editors/render/render_internal.c
branches/smoke2/source/blender/editors/render/render_opengl.c
branches/smoke2/source/blender/editors/render/render_preview.c
branches/smoke2/source/blender/editors/render/render_shading.c
branches/smoke2/source/blender/editors/render/render_update.c
branches/smoke2/source/blender/editors/screen/screen_edit.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_hide.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_image.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_vertex.c
branches/smoke2/source/blender/editors/sculpt_paint/sculpt.c
branches/smoke2/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/smoke2/source/blender/editors/space_file/file_draw.c
branches/smoke2/source/blender/editors/space_file/file_ops.c
branches/smoke2/source/blender/editors/space_file/filelist.c
branches/smoke2/source/blender/editors/space_file/filesel.c
branches/smoke2/source/blender/editors/space_image/image_buttons.c
branches/smoke2/source/blender/editors/space_image/space_image.c
branches/smoke2/source/blender/editors/space_logic/logic_window.c
branches/smoke2/source/blender/editors/space_node/node_draw.c
branches/smoke2/source/blender/editors/space_node/node_edit.c
branches/smoke2/source/blender/editors/space_node/node_select.c
branches/smoke2/source/blender/editors/space_outliner/outliner_tools.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_select.c
branches/smoke2/source/blender/editors/space_view3d/drawobject.c
branches/smoke2/source/blender/editors/space_view3d/view3d_buttons.c
branches/smoke2/source/blender/editors/space_view3d/view3d_edit.c
branches/smoke2/source/blender/editors/space_view3d/view3d_header.c
branches/smoke2/source/blender/editors/space_view3d/view3d_select.c
branches/smoke2/source/blender/editors/space_view3d/view3d_snap.c
branches/smoke2/source/blender/editors/space_view3d/view3d_view.c
branches/smoke2/source/blender/editors/transform/transform.c
branches/smoke2/source/blender/editors/transform/transform_conversions.c
branches/smoke2/source/blender/editors/transform/transform_generics.c
branches/smoke2/source/blender/editors/transform/transform_manipulator.c
branches/smoke2/source/blender/editors/transform/transform_orientations.c
branches/smoke2/source/blender/editors/util/crazyspace.c
branches/smoke2/source/blender/editors/util/undo.c
branches/smoke2/source/blender/editors/uvedit/uvedit_buttons.c
branches/smoke2/source/blender/editors/uvedit/uvedit_draw.c
branches/smoke2/source/blender/editors/uvedit/uvedit_ops.c
branches/smoke2/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/smoke2/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/smoke2/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/smoke2/source/blender/gpu/intern/gpu_buffers.c
branches/smoke2/source/blender/gpu/intern/gpu_codegen.c
branches/smoke2/source/blender/gpu/intern/gpu_extensions.c
branches/smoke2/source/blender/gpu/intern/gpu_material.c
branches/smoke2/source/blender/ikplugin/intern/iksolver_plugin.c
branches/smoke2/source/blender/imbuf/intern/anim_movie.c
branches/smoke2/source/blender/imbuf/intern/bmp.c
branches/smoke2/source/blender/imbuf/intern/indexer.c
branches/smoke2/source/blender/imbuf/intern/jp2.c
branches/smoke2/source/blender/imbuf/intern/png.c
branches/smoke2/source/blender/imbuf/intern/util.c
branches/smoke2/source/blender/makesdna/DNA_key_types.h
branches/smoke2/source/blender/makesdna/DNA_meshdata_types.h
branches/smoke2/source/blender/makesdna/DNA_sequence_types.h
branches/smoke2/source/blender/makesdna/intern/makesdna.c
branches/smoke2/source/blender/makesrna/intern/makesrna.c
branches/smoke2/source/blender/makesrna/intern/rna_actuator.c
branches/smoke2/source/blender/makesrna/intern/rna_brush.c
branches/smoke2/source/blender/makesrna/intern/rna_curve.c
branches/smoke2/source/blender/makesrna/intern/rna_image.c
branches/smoke2/source/blender/makesrna/intern/rna_image_api.c
branches/smoke2/source/blender/makesrna/intern/rna_key.c
branches/smoke2/source/blender/makesrna/intern/rna_main_api.c
branches/smoke2/source/blender/makesrna/intern/rna_mesh.c
branches/smoke2/source/blender/makesrna/intern/rna_meta.c
branches/smoke2/source/blender/makesrna/intern/rna_nodetree.c
branches/smoke2/source/blender/makesrna/intern/rna_particle.c
branches/smoke2/source/blender/makesrna/intern/rna_scene.c
branches/smoke2/source/blender/makesrna/intern/rna_texture.c
branches/smoke2/source/blender/makesrna/intern/rna_tracking.c
branches/smoke2/source/blender/makesrna/intern/rna_userdef.c
branches/smoke2/source/blender/modifiers/intern/MOD_array.c
branches/smoke2/source/blender/modifiers/intern/MOD_bevel.c
branches/smoke2/source/blender/modifiers/intern/MOD_edgesplit.c
branches/smoke2/source/blender/modifiers/intern/MOD_explode.c
branches/smoke2/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/smoke2/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_image.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_math.c
branches/smoke2/source/blender/nodes/intern/node_common.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_types.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_types.h
branches/smoke2/source/blender/python/bmesh/bmesh_py_utils.c
branches/smoke2/source/blender/python/intern/bpy.c
branches/smoke2/source/blender/python/intern/bpy_interface.c
branches/smoke2/source/blender/python/mathutils/mathutils.c
branches/smoke2/source/blender/python/mathutils/mathutils.h
branches/smoke2/source/blender/python/mathutils/mathutils_geometry.c
branches/smoke2/source/blender/render/intern/source/convertblender.c
branches/smoke2/source/blender/render/intern/source/rayshade.c
branches/smoke2/source/blender/render/intern/source/render_texture.c
branches/smoke2/source/blender/render/intern/source/renderdatabase.c
branches/smoke2/source/blender/render/intern/source/shadbuf.c
branches/smoke2/source/blender/render/intern/source/shadeinput.c
branches/smoke2/source/blender/render/intern/source/shadeoutput.c
branches/smoke2/source/blender/render/intern/source/sss.c
branches/smoke2/source/blender/render/intern/source/strand.c
branches/smoke2/source/blender/render/intern/source/volume_precache.c
branches/smoke2/source/blender/windowmanager/intern/wm_keymap.c
branches/smoke2/source/blender/windowmanager/intern/wm_operators.c
branches/smoke2/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/smoke2/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/smoke2/source/gameengine/Ketsji/KX_ObstacleSimulation.h
branches/smoke2/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/smoke2/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/smoke2/source/gameengine/Ketsji/KX_SteeringActuator.cpp
branches/smoke2/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/smoke2/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/smoke2/source/gameengine/SceneGraph/SG_ParentRelation.h
branches/smoke2/source/tools/spell_check_source_config.py
branches/smoke2/source/tools/uncrustify.cfg
Property Changed:
----------------
branches/smoke2/
branches/smoke2/source/blender/editors/space_outliner/
Property changes on: branches/smoke2
___________________________________________________________________
Modified: svn:mergeinfo
- /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
/trunk/blender:45664-45710,45712-45744
+ /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
/trunk/blender:45664-45710,45712-45744,45747-45853
Modified: branches/smoke2/CMakeLists.txt
===================================================================
--- branches/smoke2/CMakeLists.txt 2012-04-22 17:31:39 UTC (rev 45853)
+++ branches/smoke2/CMakeLists.txt 2012-04-22 19:20:22 UTC (rev 45854)
@@ -370,11 +370,6 @@
"because it is currently unsupported, remove this "
"line if youre a developer who wants to add support.")
endif()
-
- if((NOT WITH_CODEC_FFMPEG) AND (WITH_CYCLES OR WITH_IMAGE_OPENEXR OR WITH_IMAGE_TIFF))
- message(FATAL_ERROR "MINGW has a problem with: WITH_CYCLES/WITH_IMAGE_OPENEXR/WITH_IMAGE_TIFF "
- "when WITH_CODEC_FFMPEG is disabled, enable FFMPEG or disable CYCLES/EXR/TIFF.")
- endif()
endif()
TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
@@ -1137,7 +1132,7 @@
set(WITH_LIBS10.5 ON CACHE BOOL "Use 10.5 libs" FORCE) # valid also for 10.6/10.7
endif()
- if(${XCODE_VERSION} LESS 4.3)
+ if(${XCODE_VERSION} VERSION_LESS 4.3)
SET(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE ) # use guaranteed existing sdk
else()
# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
Modified: branches/smoke2/build_files/cmake/macros.cmake
===================================================================
--- branches/smoke2/build_files/cmake/macros.cmake 2012-04-22 17:31:39 UTC (rev 45853)
+++ branches/smoke2/build_files/cmake/macros.cmake 2012-04-22 19:20:22 UTC (rev 45854)
@@ -212,11 +212,9 @@
target_link_libraries(${target}
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
- ${JPEG_LIBRARIES}
${PNG_LIBRARIES}
${ZLIB_LIBRARIES}
- ${FREETYPE_LIBRARY}
- ${PLATFORM_LINKLIBS})
+ ${FREETYPE_LIBRARY})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs
@@ -271,6 +269,7 @@
if(WITH_BOOST)
target_link_libraries(${target} ${BOOST_LIBRARIES})
endif()
+ target_link_libraries(${target} ${JPEG_LIBRARIES})
if(WITH_IMAGE_OPENEXR)
if(WIN32 AND NOT UNIX AND NOT CMAKE_COMPILER_IS_GNUCC)
file_list_suffix(OPENEXR_LIBRARIES_DEBUG "${OPENEXR_LIBRARIES}" "_d")
@@ -328,6 +327,8 @@
if(WIN32 AND NOT UNIX)
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
endif()
+
+ target_link_libraries(${target} ${PLATFORM_LINKLIBS})
endmacro()
macro(TEST_SSE_SUPPORT
@@ -677,4 +678,4 @@
endif()
-endmacro()
\ No newline at end of file
+endmacro()
Modified: branches/smoke2/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/smoke2/doc/python_api/sphinx_doc_gen.py 2012-04-22 17:31:39 UTC (rev 45853)
+++ branches/smoke2/doc/python_api/sphinx_doc_gen.py 2012-04-22 19:20:22 UTC (rev 45854)
@@ -131,7 +131,7 @@
dest="sphinx_theme",
type=str,
default='default',
- help =
+ help=
# see SPHINX_THEMES below
"Sphinx theme (default='default')\n"
"Available themes\n"
Modified: branches/smoke2/intern/cycles/render/film.cpp
===================================================================
--- branches/smoke2/intern/cycles/render/film.cpp 2012-04-22 17:31:39 UTC (rev 45853)
+++ branches/smoke2/intern/cycles/render/film.cpp 2012-04-22 19:20:22 UTC (rev 45854)
@@ -125,7 +125,6 @@
break;
case PASS_AO:
pass.components = 4;
- pass.exposure = true;
break;
case PASS_SHADOW:
pass.components = 4;
Modified: branches/smoke2/intern/elbeem/intern/ntl_world.cpp
===================================================================
--- branches/smoke2/intern/elbeem/intern/ntl_world.cpp 2012-04-22 17:31:39 UTC (rev 45853)
+++ branches/smoke2/intern/elbeem/intern/ntl_world.cpp 2012-04-22 19:20:22 UTC (rev 45854)
@@ -400,8 +400,8 @@
bool done = false;
bool allPanic = true;
- // stop/quit, dont display/render
- if(getElbeemState()==SIMWORLD_STOP) {
+ // stop/quit (abort), dont display/render
+ if(!isSimworldOk()) {
return 1;
}
@@ -411,6 +411,9 @@
// time stopped? nothing else to do...
if( (*mpSims)[mFirstSim]->getFrameTime(framenum) <= 0.0 ){
done=true; allPanic=false;
+
+ /* DG: Need to check for user cancel here (fix for [#30298]) */
+ (*mpSims)[mFirstSim]->checkCallerStatus(FLUIDSIM_CBSTATUS_STEP, 0);
}
int gstate = 0;
Modified: branches/smoke2/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/smoke2/intern/elbeem/intern/solver_init.cpp 2012-04-22 17:31:39 UTC (rev 45853)
+++ branches/smoke2/intern/elbeem/intern/solver_init.cpp 2012-04-22 19:20:22 UTC (rev 45854)
@@ -1455,9 +1455,7 @@
//errMsg("GEOACTT"," obj "<<obj->getName()<<" a:"<<active<<","<<wasActive<<" s"<<sourceTime<<" t"<<targetTime <<" v"<<mObjectSpeeds[OId] );
// skip inactive in/out flows
if(ntype==CFInvalid){ errMsg("LbmFsgrSolver::initMovingObstacles","Invalid obj type "<<obj->getGeoInitType()); continue; }
- /* DG: only inflows/outlfows could be activated/deactivated, test new code that everything can be activated
- if((!active) && (otype&(CFMbndOutflow|CFMbndInflow)) ) continue; */
- if((!active) /* && (otype&(CFMbndOutflow|CFMbndInflow)) */ ) continue;
+ if((!active) && (otype&(CFMbndOutflow|CFMbndInflow)) ) continue;
// copied from recalculateObjectSpeeds
mObjectSpeeds[OId] = vec2L(mpParam->calculateLattVelocityFromRw( vec2P( (*mpGiObjects)[OId]->getInitialVelocity(mSimulationTime) )));
Modified: branches/smoke2/intern/opennl/CMakeLists.txt
===================================================================
--- branches/smoke2/intern/opennl/CMakeLists.txt 2012-04-22 17:31:39 UTC (rev 45853)
+++ branches/smoke2/intern/opennl/CMakeLists.txt 2012-04-22 19:20:22 UTC (rev 45854)
@@ -28,7 +28,7 @@
# remove debug flag here since this is not a blender maintained library
# and debug gives a lot of prints on UV unwrapping. developers can enable if they need to.
-remove_cc_flag("-DDEBUG")
+add_definitions(-UDEBUG)
# quiet compiler warnings about undefined defines
Modified: branches/smoke2/release/scripts/startup/bl_operators/mesh.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_operators/mesh.py 2012-04-22 17:31:39 UTC (rev 45853)
+++ branches/smoke2/release/scripts/startup/bl_operators/mesh.py 2012-04-22 19:20:22 UTC (rev 45854)
@@ -100,7 +100,7 @@
vidxs[i] = tuple(sorted(l.vertex_index
for l in loops[lstart:lend]))
# As we have no poly.center yet...
- pcents[i] = tuple(map(lambda x : x / p.loop_total,
+ pcents[i] = tuple(map(lambda x: x / p.loop_total,
map(sum, zip(*(verts[idx].co
for idx in vidxs[i])))))
# Preparing next step finding matching polys.
Modified: branches/smoke2/release/scripts/startup/bl_operators/presets.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_operators/presets.py 2012-04-22 17:31:39 UTC (rev 45853)
+++ branches/smoke2/release/scripts/startup/bl_operators/presets.py 2012-04-22 19:20:22 UTC (rev 45854)
@@ -294,21 +294,22 @@
preset_subdir = "cloth"
+
class AddPresetFluid(AddPresetBase, Operator):
'''Add a Fluid Preset'''
bl_idname = "fluid.preset_add"
bl_label = "Add Fluid Preset"
preset_menu = "FLUID_MT_presets"
-
+
preset_defines = [
"fluid = bpy.context.fluid"
]
-
+
preset_values = [
"fluid.settings.viscosity_base",
"fluid.settings.viscosity_exponent",
]
-
+
preset_subdir = "fluid"
Modified: branches/smoke2/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_ui/properties_game.py 2012-04-22 17:31:39 UTC (rev 45853)
+++ branches/smoke2/release/scripts/startup/bl_ui/properties_game.py 2012-04-22 19:20:22 UTC (rev 45854)
@@ -166,7 +166,7 @@
subsub.active = game.use_anisotropic_friction
subsub.prop(game, "friction_coefficients", text="", slider=True)
- elif physics_type =='SENSOR':
+ elif physics_type == 'SENSOR':
col = layout.column()
col.prop(game, "use_actor", text="Detect Actors")
col.prop(ob, "hide_render", text="Invisible")
Modified: branches/smoke2/release/scripts/startup/bl_ui/properties_particle.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_ui/properties_particle.py 2012-04-22 17:31:39 UTC (rev 45853)
+++ branches/smoke2/release/scripts/startup/bl_ui/properties_particle.py 2012-04-22 19:20:22 UTC (rev 45854)
@@ -1185,7 +1185,7 @@
psys = context.particle_system
split = layout.split(percentage=0.85)
-
+
col = split.column()
col.label(text="Vertex Group:")
col.prop_search(psys, "vertex_group_density", ob, "vertex_groups", text="Density")
@@ -1195,7 +1195,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list