Merge remote-tracking branch 'refs/remotes/origin/master' into Build-Sets

This commit is contained in:
FlightControl 2016-06-08 09:33:29 +02:00
commit b925339f24
18 changed files with 17 additions and 5 deletions

View File

@ -288,7 +288,11 @@ function SET_BASE:ForEach( IteratorFunction, arg, Set, Function, FunctionArgumen
local Count = 0
for ObjectID, Object in pairs( Set ) do
self:T2( Object )
if Function( unpack( FunctionArguments ), Object ) == true then
if Function then
if Function( unpack( FunctionArguments ), Object ) == true then
IteratorFunction( Object, unpack( arg ) )
end
else
IteratorFunction( Object, unpack( arg ) )
end
Count = Count + 1

View File

@ -1,5 +1,5 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' )
env.info( 'Moose Generation Timestamp: 20160607_1223' )
env.info( 'Moose Generation Timestamp: 20160607_1320' )
local base = _G
env.info("Loading MOOSE " .. base.timer.getAbsTime() )
@ -9628,7 +9628,11 @@ function SET_BASE:ForEach( IteratorFunction, arg, Set, Function, FunctionArgumen
local Count = 0
for ObjectID, Object in pairs( Set ) do
self:T2( Object )
if Function( unpack( FunctionArguments ), Object ) == true then
if Function then
if Function( unpack( FunctionArguments ), Object ) == true then
IteratorFunction( Object, unpack( arg ) )
end
else
IteratorFunction( Object, unpack( arg ) )
end
Count = Count + 1

View File

@ -1,5 +1,5 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' )
env.info( 'Moose Generation Timestamp: 20160607_1223' )
env.info( 'Moose Generation Timestamp: 20160607_1320' )
local base = _G
env.info("Loading MOOSE " .. base.timer.getAbsTime() )
@ -9628,7 +9628,11 @@ function SET_BASE:ForEach( IteratorFunction, arg, Set, Function, FunctionArgumen
local Count = 0
for ObjectID, Object in pairs( Set ) do
self:T2( Object )
if Function( unpack( FunctionArguments ), Object ) == true then
if Function then
if Function( unpack( FunctionArguments ), Object ) == true then
IteratorFunction( Object, unpack( arg ) )
end
else
IteratorFunction( Object, unpack( arg ) )
end
Count = Count + 1