Revision: 31003 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31003 Author: campbellbarton Date: 2010-08-03 10:12:55 +0200 (Tue, 03 Aug 2010)
Log Message: ----------- remove commented scons lines from cmake files, fixed use of pointer poll function for ID drobdowns (currently unused) Modified Paths: -------------- trunk/blender/source/blender/avi/CMakeLists.txt trunk/blender/source/blender/blenlib/CMakeLists.txt trunk/blender/source/blender/blenpluginapi/CMakeLists.txt trunk/blender/source/blender/editors/interface/interface_templates.c trunk/blender/source/blender/imbuf/CMakeLists.txt trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt trunk/blender/source/blender/makesrna/intern/rna_define.c trunk/blender/source/blender/quicktime/CMakeLists.txt trunk/blender/source/blender/readblenfile/CMakeLists.txt trunk/blender/source/blender/render/CMakeLists.txt trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt trunk/blender/source/gameengine/Converter/CMakeLists.txt trunk/blender/source/gameengine/Expressions/CMakeLists.txt trunk/blender/source/gameengine/GameLogic/CMakeLists.txt trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt trunk/blender/source/gameengine/Ketsji/CMakeLists.txt trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt trunk/blender/source/gameengine/Network/CMakeLists.txt trunk/blender/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt trunk/blender/source/gameengine/Physics/Dummy/CMakeLists.txt trunk/blender/source/gameengine/Physics/common/CMakeLists.txt trunk/blender/source/gameengine/Rasterizer/CMakeLists.txt trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt trunk/blender/source/gameengine/SceneGraph/CMakeLists.txt trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt trunk/blender/source/kernel/CMakeLists.txt Modified: trunk/blender/source/blender/avi/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/avi/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/avi/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -32,4 +32,3 @@ ) BLENDERLIB(bf_avi "${SRC}" "${INC}") -#env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [90, 50] ) Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/blenlib/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/blenlib/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -49,7 +49,3 @@ ENDIF(WITH_OPENMP) BLENDERLIB(bf_blenlib "${SRC}" "${INC}") -#if env['OURPLATFORM'] == 'linux2': -# cflags='-pthread' -# -#env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [85,195], compileflags =cflags ) Modified: trunk/blender/source/blender/blenpluginapi/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -40,4 +40,3 @@ ENDIF(WITH_QUICKTIME) BLENDERLIB(bf_blenpluginapi "${SRC}" "${INC}") -#env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'player'], priority = [75, 35] ) Modified: trunk/blender/source/blender/editors/interface/interface_templates.c =================================================================== --- trunk/blender/source/blender/editors/interface/interface_templates.c 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/editors/interface/interface_templates.c 2010-08-03 08:12:55 UTC (rev 31003) @@ -182,10 +182,10 @@ PointerRNA ptr; RNA_id_pointer_create(id, &ptr); if(RNA_property_pointer_poll(&template->ptr, template->prop, &ptr)==0) - filter_yes= 1; + continue; } - if (filter_yes==0 && template->filterop[0] != 0) { + if (template->filterop[0] != 0) { /* XXX, remove this, use pointer filtering */ PointerRNA ptr; ReportList reports; Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/imbuf/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/imbuf/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -73,4 +73,3 @@ ENDIF(WITH_DDS) BLENDERLIB(bf_imbuf "${SRC}" "${INC}") -#env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] ) Modified: trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -38,4 +38,3 @@ ) BLENDERLIB(bf_cineon "${SRC}" "${INC}") -#env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [90, 200]) Modified: trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -42,4 +42,3 @@ ENDIF(WITH_DDS) BLENDERLIB(bf_dds "${SRC}" "${INC}") -#env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [90, 200]) Modified: trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -43,4 +43,3 @@ ENDIF(WITH_OPENEXR) BLENDERLIB(bf_openexr "${SRC}" "${INC}") -#env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [90, 200]) Modified: trunk/blender/source/blender/makesrna/intern/rna_define.c =================================================================== --- trunk/blender/source/blender/makesrna/intern/rna_define.c 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/makesrna/intern/rna_define.c 2010-08-03 08:12:55 UTC (rev 31003) @@ -476,7 +476,7 @@ if(srna->flag & STRUCT_RUNTIME) { if(RNA_struct_py_type_get(srna)) { - fprintf(stderr, "StructRNA \"%s\" freed while holding a python reference\n", srna->name); + fprintf(stderr, "RNA_struct_free '%s' freed while holding a python reference\n", srna->identifier); } } Modified: trunk/blender/source/blender/quicktime/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/quicktime/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/quicktime/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -52,11 +52,3 @@ ADD_DEFINITIONS(-DWITH_QUICKTIME) BLENDERLIB(bf_quicktime "${SRC}" "${INC}") -#if env['OURPLATFORM'] in ['win32-vc', 'darwin']: -# types = ['core', 'player'] -# priorities = [95, 200] -#else: -# types = ['core'] -# priorities = [95] -# -#env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=['WITH_QUICKTIME'], libtype=types, priority=priorities) Modified: trunk/blender/source/blender/readblenfile/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/readblenfile/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/readblenfile/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -31,4 +31,3 @@ ) BLENDERLIB(bf_readblenfile "${SRC}" "${INC}") -#env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['common','player'], priority = [0, 220] ) Modified: trunk/blender/source/blender/render/CMakeLists.txt =================================================================== --- trunk/blender/source/blender/render/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/blender/render/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -54,9 +54,4 @@ ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") ENDIF(APPLE) -#TODO -#if env['OURPLATFORM']=='linux2': -# cflags='-pthread' - BLENDERLIB_NOLIST(blender_render "${SRC}" "${INC}") -#env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags ) Modified: trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt =================================================================== --- trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -50,4 +50,3 @@ ENDIF(WITH_PYTHON) BLENDERLIB(bf_blroutines "${SRC}" "${INC}") -#env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game', 'game2', 'player'], priority=[0, 0, 55] , compileflags=cxxflags) Modified: trunk/blender/source/gameengine/Converter/CMakeLists.txt =================================================================== --- trunk/blender/source/gameengine/Converter/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/gameengine/Converter/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -70,4 +70,3 @@ ENDIF(WITH_PYTHON) BLENDERLIB(bf_converter "${SRC}" "${INC}") -#env.BlenderLib ( 'bf_converter', sources, Split(incs), [], libtype=['game','player'], priority=[5,70] ) Modified: trunk/blender/source/gameengine/Expressions/CMakeLists.txt =================================================================== --- trunk/blender/source/gameengine/Expressions/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/gameengine/Expressions/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -43,4 +43,3 @@ ENDIF(WITH_PYTHON) BLENDERLIB(bf_expressions "${SRC}" "${INC}") -#env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['game','player'], priority = [45,125] ) Modified: trunk/blender/source/gameengine/GameLogic/CMakeLists.txt =================================================================== --- trunk/blender/source/gameengine/GameLogic/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/gameengine/GameLogic/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -49,4 +49,3 @@ ENDIF(WITH_PYTHON) BLENDERLIB(bf_logic "${SRC}" "${INC}") -#env.BlenderLib ( 'bf_logic', sources, Split(incs), [], libtype=['game','player'], priority=[30, 110] ) Modified: trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt =================================================================== --- trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -74,4 +74,3 @@ ADD_DEFINITIONS(-DGLEW_STATIC) BLENDERLIB_NOLIST(gp_common "${SRC}" "${INC}") -#env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype='player', priority=5, compileflags=cflags) Modified: trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt =================================================================== --- trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt 2010-08-03 08:07:21 UTC (rev 31002) +++ trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt 2010-08-03 08:12:55 UTC (rev 31003) @@ -73,4 +73,3 @@ ENDIF(WITH_FFMPEG) BLENDERLIB_NOLIST(gp_ghost "${SRC}" "${INC}") @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs