[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23477] branches/ge_dyn_load: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22959 :22999

Campbell Barton ideasman42 at gmail.com
Fri Sep 25 07:30:08 CEST 2009


Revision: 23477
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23477
Author:   campbellbarton
Date:     2009-09-25 07:30:07 +0200 (Fri, 25 Sep 2009)

Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22959:22999

Modified Paths:
--------------
    branches/ge_dyn_load/CMakeLists.txt
    branches/ge_dyn_load/SConstruct
    branches/ge_dyn_load/extern/ffmpeg/SConscript
    branches/ge_dyn_load/extern/libmp3lame/SConscript
    branches/ge_dyn_load/extern/libredcode/SConscript
    branches/ge_dyn_load/extern/x264/SConscript
    branches/ge_dyn_load/extern/xvidcore/SConscript
    branches/ge_dyn_load/intern/guardedalloc/SConscript
    branches/ge_dyn_load/intern/memutil/SConscript
    branches/ge_dyn_load/release/ui/bpy_ops.py
    branches/ge_dyn_load/release/ui/buttons_data_bone.py
    branches/ge_dyn_load/release/ui/buttons_data_modifier.py
    branches/ge_dyn_load/release/ui/space_console.py
    branches/ge_dyn_load/release/ui/space_view3d.py
    branches/ge_dyn_load/source/SConscript
    branches/ge_dyn_load/source/blender/blenkernel/intern/anim_sys.c
    branches/ge_dyn_load/source/blender/blenlib/BLI_voxel.h
    branches/ge_dyn_load/source/blender/blenlib/intern/storage.c
    branches/ge_dyn_load/source/blender/blenlib/intern/util.c
    branches/ge_dyn_load/source/blender/blenlib/intern/voxel.c
    branches/ge_dyn_load/source/blender/blenloader/SConscript
    branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c
    branches/ge_dyn_load/source/blender/blenpluginapi/SConscript
    branches/ge_dyn_load/source/blender/editors/animation/anim_channels_defines.c
    branches/ge_dyn_load/source/blender/editors/animation/anim_intern.h
    branches/ge_dyn_load/source/blender/editors/animation/anim_ops.c
    branches/ge_dyn_load/source/blender/editors/animation/drivers.c
    branches/ge_dyn_load/source/blender/editors/animation/keyframes_draw.c
    branches/ge_dyn_load/source/blender/editors/animation/keyframes_edit.c
    branches/ge_dyn_load/source/blender/editors/animation/keyframes_general.c
    branches/ge_dyn_load/source/blender/editors/animation/keyframing.c
    branches/ge_dyn_load/source/blender/editors/animation/keyingsets.c
    branches/ge_dyn_load/source/blender/editors/armature/editarmature.c
    branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_buttons.c
    branches/ge_dyn_load/source/blender/editors/include/ED_anim_api.h
    branches/ge_dyn_load/source/blender/editors/include/ED_keyframes_draw.h
    branches/ge_dyn_load/source/blender/editors/include/ED_keyframes_edit.h
    branches/ge_dyn_load/source/blender/editors/include/ED_keyframing.h
    branches/ge_dyn_load/source/blender/editors/interface/interface_anim.c
    branches/ge_dyn_load/source/blender/editors/interface/interface_handlers.c
    branches/ge_dyn_load/source/blender/editors/interface/interface_intern.h
    branches/ge_dyn_load/source/blender/editors/object/editconstraint.c
    branches/ge_dyn_load/source/blender/editors/object/object_edit.c
    branches/ge_dyn_load/source/blender/editors/object/object_intern.h
    branches/ge_dyn_load/source/blender/editors/object/object_modifier.c
    branches/ge_dyn_load/source/blender/editors/object/object_ops.c
    branches/ge_dyn_load/source/blender/editors/physics/ed_pointcache.c
    branches/ge_dyn_load/source/blender/editors/screen/area.c
    branches/ge_dyn_load/source/blender/editors/screen/screen_ops.c
    branches/ge_dyn_load/source/blender/editors/space_action/action_edit.c
    branches/ge_dyn_load/source/blender/editors/space_action/action_header.c
    branches/ge_dyn_load/source/blender/editors/space_action/action_intern.h
    branches/ge_dyn_load/source/blender/editors/space_action/action_ops.c
    branches/ge_dyn_load/source/blender/editors/space_buttons/buttons_ops.c
    branches/ge_dyn_load/source/blender/editors/space_console/console_ops.c
    branches/ge_dyn_load/source/blender/editors/space_console/console_report.c
    branches/ge_dyn_load/source/blender/editors/space_console/space_console.c
    branches/ge_dyn_load/source/blender/editors/space_file/file_intern.h
    branches/ge_dyn_load/source/blender/editors/space_file/file_ops.c
    branches/ge_dyn_load/source/blender/editors/space_file/space_file.c
    branches/ge_dyn_load/source/blender/editors/space_graph/graph_edit.c
    branches/ge_dyn_load/source/blender/editors/space_graph/graph_header.c
    branches/ge_dyn_load/source/blender/editors/space_nla/nla_buttons.c
    branches/ge_dyn_load/source/blender/editors/space_nla/nla_draw.c
    branches/ge_dyn_load/source/blender/editors/space_outliner/outliner.c
    branches/ge_dyn_load/source/blender/editors/space_text/text_ops.c
    branches/ge_dyn_load/source/blender/editors/transform/transform_conversions.c
    branches/ge_dyn_load/source/blender/gpu/SConscript
    branches/ge_dyn_load/source/blender/imbuf/intern/cineon/SConscript
    branches/ge_dyn_load/source/blender/imbuf/intern/dds/SConscript
    branches/ge_dyn_load/source/blender/imbuf/intern/openexr/SConscript
    branches/ge_dyn_load/source/blender/makesdna/DNA_curve_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_texture_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_windowmanager_types.h
    branches/ge_dyn_load/source/blender/makesdna/SConscript
    branches/ge_dyn_load/source/blender/makesrna/RNA_enum_types.h
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_ID.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_curve.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_gpencil.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_nla.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_texture.c
    branches/ge_dyn_load/source/blender/python/epy_doc_gen.py
    branches/ge_dyn_load/source/blender/python/intern/bpy_array.c
    branches/ge_dyn_load/source/blender/python/intern/bpy_interface.c
    branches/ge_dyn_load/source/blender/python/intern/bpy_operator.c
    branches/ge_dyn_load/source/blender/python/intern/bpy_operator_wrap.c
    branches/ge_dyn_load/source/blender/python/intern/bpy_rna.c
    branches/ge_dyn_load/source/blender/python/intern/bpy_util.c
    branches/ge_dyn_load/source/blender/python/intern/bpy_util.h
    branches/ge_dyn_load/source/blender/readblenfile/SConscript
    branches/ge_dyn_load/source/blender/render/intern/source/voxeldata.c
    branches/ge_dyn_load/source/blender/windowmanager/WM_api.h
    branches/ge_dyn_load/source/blender/windowmanager/intern/wm.c
    branches/ge_dyn_load/source/blender/windowmanager/intern/wm_event_system.c
    branches/ge_dyn_load/source/gameengine/BlenderRoutines/SConscript
    branches/ge_dyn_load/source/gameengine/Converter/SConscript
    branches/ge_dyn_load/source/gameengine/Expressions/SConscript
    branches/ge_dyn_load/source/gameengine/GameLogic/SConscript
    branches/ge_dyn_load/source/gameengine/GamePlayer/common/GPC_Engine.cpp
    branches/ge_dyn_load/source/gameengine/GamePlayer/common/SConscript
    branches/ge_dyn_load/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/ge_dyn_load/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/ge_dyn_load/source/gameengine/GamePlayer/ghost/SConscript
    branches/ge_dyn_load/source/gameengine/Ketsji/KXNetwork/SConscript
    branches/ge_dyn_load/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/ge_dyn_load/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/ge_dyn_load/source/gameengine/Ketsji/SConscript
    branches/ge_dyn_load/source/gameengine/Network/LoopBackNetwork/SConscript
    branches/ge_dyn_load/source/gameengine/Network/SConscript
    branches/ge_dyn_load/source/gameengine/Physics/Bullet/SConscript
    branches/ge_dyn_load/source/gameengine/Physics/Dummy/SConscript
    branches/ge_dyn_load/source/gameengine/Physics/common/SConscript
    branches/ge_dyn_load/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/ge_dyn_load/source/gameengine/Rasterizer/SConscript
    branches/ge_dyn_load/source/gameengine/SceneGraph/SConscript
    branches/ge_dyn_load/source/gameengine/VideoTexture/SConscript
    branches/ge_dyn_load/source/icons/SConscript
    branches/ge_dyn_load/source/kernel/SConscript
    branches/ge_dyn_load/tools/Blender.py

Added Paths:
-----------
    branches/ge_dyn_load/source/blenderplayer/
    branches/ge_dyn_load/source/blenderplayer/bad_level_call_stubs/

Removed Paths:
-------------
    branches/ge_dyn_load/blenderplayer/
    branches/ge_dyn_load/source/blenderplayer/bad_level_call_stubs/

Modified: branches/ge_dyn_load/CMakeLists.txt
===================================================================
--- branches/ge_dyn_load/CMakeLists.txt	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/CMakeLists.txt	2009-09-25 05:30:07 UTC (rev 23477)
@@ -574,6 +574,6 @@
 #-----------------------------------------------------------------------------
 # Blender Player
 IF(WITH_PLAYER)
-  ADD_SUBDIRECTORY(blenderplayer)
+  ADD_SUBDIRECTORY(source/blenderplayer)
 ENDIF(WITH_PLAYER)
 

Modified: branches/ge_dyn_load/SConstruct
===================================================================
--- branches/ge_dyn_load/SConstruct	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/SConstruct	2009-09-25 05:30:07 UTC (rev 23477)
@@ -207,7 +207,6 @@
 				env.Append(CCFLAGS=['-fopenmp']) 
 				env.Append(CPPFLAGS=['-fopenmp'])
 				env.Append(CXXFLAGS=['-fopenmp'])
-				# env.Append(LINKFLAGS=['-fprofile-generate'])
 
 #check for additional debug libnames
 
@@ -301,7 +300,6 @@
 	env['PLATFORM_LINKFLAGS'].append('/ENTRY:main')
 
 # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
-#B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep)
 B.root_build_dir = env['BF_BUILDDIR']
 B.doc_build_dir = env['BF_DOCDIR']
 if not B.root_build_dir[-1]==os.sep:
@@ -392,7 +390,7 @@
 # libraries to give as objects to linking phase
 mainlist = []
 for tp in B.possible_types:
-	if not tp == 'player' and not tp == 'player2':
+	if not tp == 'player':
 		mainlist += B.create_blender_liblist(env, tp)
 
 if B.arguments.get('BF_PRIORITYLIST', '0')=='1':
@@ -402,14 +400,11 @@
 thestatlibs, thelibincs = B.setup_staticlibs(env)
 thesyslibs = B.setup_syslibs(env)
 
-if env['WITH_BF_PLAYER']:
-	print("Warning: Game player may not build on 2.5")
-
 if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
-	#env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist + thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 	env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
 	playerlist = B.create_blender_liblist(env, 'player')
+	playerlist = playerlist[0:2] + [mainlist[0]] + mainlist[2:] + [playerlist[2]]
 	env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
 
 ##### Now define some targets
@@ -582,11 +577,6 @@
 						'${LCGDIR}/ffmpeg/lib/avformat-52.dll',
 						'${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
 						'${LCGDIR}/ffmpeg/lib/avutil-50.dll',
-#						'${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
-#						'${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
-#						'${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
-#						'${LCGDIR}/ffmpeg/lib/libx264-67.dll',
-#						'${LCGDIR}/ffmpeg/lib/xvidcore.dll',
 						'${LCGDIR}/ffmpeg/lib/swscale-0.dll']
 	if env['WITH_BF_JACK']:
 		dllsources += ['${LCGDIR}/jack/lib/libjack.dll']

Modified: branches/ge_dyn_load/extern/ffmpeg/SConscript
===================================================================
--- branches/ge_dyn_load/extern/ffmpeg/SConscript	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/extern/ffmpeg/SConscript	2009-09-25 05:30:07 UTC (rev 23477)
@@ -182,6 +182,6 @@
     ff_env.BlenderLib (libname="extern_" + lib, sources=sources,
                     includes=["."] + all_libs + extra_includes,
                     defines=Split(defs),
-                    libtype=['core', 'intern', 'player'],
-                    priority = [5, 5, 200],
+                    libtype=['core', 'intern'],
+                    priority = [5, 5],
                     compileflags = Split(cflags))

Modified: branches/ge_dyn_load/extern/libmp3lame/SConscript
===================================================================
--- branches/ge_dyn_load/extern/libmp3lame/SConscript	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/extern/libmp3lame/SConscript	2009-09-25 05:30:07 UTC (rev 23477)
@@ -89,6 +89,6 @@
                 includes=[".", "${SOURCE.dir}"],
                 defines=["HAVE_INTTYPES_H", "STDC_HEADERS",
                          "ieee754_float32_t=float", "BRHIST"],
-                libtype=['core', 'intern', 'player'],
-                priority = [10, 10, 300],
+                libtype=['core', 'intern'],
+                priority = [10, 10],
                 compileflags = [])

Modified: branches/ge_dyn_load/extern/libredcode/SConscript
===================================================================
--- branches/ge_dyn_load/extern/libredcode/SConscript	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/extern/libredcode/SConscript	2009-09-25 05:30:07 UTC (rev 23477)
@@ -12,5 +12,5 @@
 env.BlenderLib ( libname='extern_redcode', 
                  sources=sources, includes=Split(incs),
                  defines=[],
-                 libtype=['core','intern','player'],
-                 priority=[5, 5, 200], compileflags = [])
+                 libtype=['core','intern'],
+                 priority=[5, 5], compileflags = [])

Modified: branches/ge_dyn_load/extern/x264/SConscript
===================================================================
--- branches/ge_dyn_load/extern/x264/SConscript	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/extern/x264/SConscript	2009-09-25 05:30:07 UTC (rev 23477)
@@ -147,6 +147,6 @@
 x264_env.BlenderLib (libname="extern_x264", sources=sources,
                      includes=["."],
                      defines=Split(defs),
-                     libtype=['core', 'intern', 'player'],
-                     priority = [10, 10, 300],
+                     libtype=['core', 'intern'],
+                     priority = [10, 10],
                      compileflags = Split(cflags))

Modified: branches/ge_dyn_load/extern/xvidcore/SConscript
===================================================================
--- branches/ge_dyn_load/extern/xvidcore/SConscript	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/extern/xvidcore/SConscript	2009-09-25 05:30:07 UTC (rev 23477)
@@ -132,6 +132,6 @@
 xvidcore_env.BlenderLib (libname="extern_xvidcore", sources=Split(sources),
                          includes=["."],
                          defines=Split(defs),
-                         libtype=['core', 'intern', 'player'],
-                         priority = [10, 10, 300],
+                         libtype=['core', 'intern'],
+                         priority = [10, 10],
                          compileflags = Split(cflags))

Modified: branches/ge_dyn_load/intern/guardedalloc/SConscript
===================================================================
--- branches/ge_dyn_load/intern/guardedalloc/SConscript	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/intern/guardedalloc/SConscript	2009-09-25 05:30:07 UTC (rev 23477)
@@ -5,4 +5,4 @@
 sources = env.Glob('intern/*.c')
 incs = '.'
 
-env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [5, 175] )
+env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern'], priority = [5] )

Modified: branches/ge_dyn_load/intern/memutil/SConscript
===================================================================
--- branches/ge_dyn_load/intern/memutil/SConscript	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/intern/memutil/SConscript	2009-09-25 05:30:07 UTC (rev 23477)
@@ -5,4 +5,4 @@
 
 incs = '. ..'
 
-env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern', 'player'], priority = [0, 180] )
+env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern'], priority = [0] )

Modified: branches/ge_dyn_load/release/ui/bpy_ops.py
===================================================================
--- branches/ge_dyn_load/release/ui/bpy_ops.py	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/release/ui/bpy_ops.py	2009-09-25 05:30:07 UTC (rev 23477)
@@ -5,6 +5,18 @@
 from bpy.__ops__ import call		as op_call
 from bpy.__ops__ import get_rna	as op_get_rna
 
+# Keep in sync with WM_types.h
+context_dict = {
+	'INVOKE_DEFAULT':0,
+	'INVOKE_REGION_WIN':1,
+	'INVOKE_AREA':2,
+	'INVOKE_SCREEN':3,
+	'EXEC_DEFAULT':4,
+	'EXEC_REGION_WIN':5,
+	'EXEC_AREA':6,
+	'EXEC_SCREEN':7,
+}
+
 class bpy_ops(object):
 	'''
 	Fake module like class.
@@ -94,10 +106,22 @@
 		# submod.foo -> SUBMOD_OT_foo
 		return self.module.upper() + '_OT_' + self.func
 	
-	def __call__(self, **kw):
+	def __call__(self, *args, **kw):
 		
 		# Get the operator from blender
-		return op_call(self.idname(), kw)
+		if len(args) > 1:
+			raise ValueError("only one argument for the execution context is supported ")
+		
+		if args:
+			try:
+				context = context_dict[args[0]]
+			except:
+				raise ValueError("Expected a single context argument in: " + str(list(context_dict.keys())))
+			
+			return op_call(self.idname(), kw, context)
+		
+		else:
+			return op_call(self.idname(), kw)
 	
 	def get_rna(self):
 		'''

Modified: branches/ge_dyn_load/release/ui/buttons_data_bone.py
===================================================================
--- branches/ge_dyn_load/release/ui/buttons_data_bone.py	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/release/ui/buttons_data_bone.py	2009-09-25 05:30:07 UTC (rev 23477)
@@ -80,6 +80,7 @@
 		
 		if not bone:
 			bone = context.edit_bone
+			pchan = None
 		else:
 			pchan = ob.pose.pose_channels[context.bone.name]
 

Modified: branches/ge_dyn_load/release/ui/buttons_data_modifier.py
===================================================================
--- branches/ge_dyn_load/release/ui/buttons_data_modifier.py	2009-09-25 05:25:44 UTC (rev 23476)
+++ branches/ge_dyn_load/release/ui/buttons_data_modifier.py	2009-09-25 05:30:07 UTC (rev 23477)
@@ -269,7 +269,11 @@
 		
 	def MULTIRES(self, layout, ob, md):
 		layout.itemR(md, "subdivision_type")
-		layout.itemO("object.multires_subdivide", text="Subdivide")
+		
+		row = layout.row()
+		row.itemO("object.multires_subdivide", text="Subdivide")
+		row.itemO("object.multires_higher_levels_delete", text="Delete Higher")
+
 		layout.itemR(md, "level")
 	
 	def PARTICLE_INSTANCE(self, layout, ob, md):

Modified: branches/ge_dyn_load/release/ui/space_console.py
===================================================================

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list