remove commented scons lines from cmake files, fixed use of pointer poll function...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Aug 2010 08:12:55 +0000 (08:12 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Aug 2010 08:12:55 +0000 (08:12 +0000)
30 files changed:
source/blender/avi/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/blenpluginapi/CMakeLists.txt
source/blender/editors/interface/interface_templates.c
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/cineon/CMakeLists.txt
source/blender/imbuf/intern/dds/CMakeLists.txt
source/blender/imbuf/intern/openexr/CMakeLists.txt
source/blender/makesrna/intern/rna_define.c
source/blender/quicktime/CMakeLists.txt
source/blender/readblenfile/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Expressions/CMakeLists.txt
source/gameengine/GameLogic/CMakeLists.txt
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
source/gameengine/Network/CMakeLists.txt
source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
source/gameengine/Physics/Bullet/CMakeLists.txt
source/gameengine/Physics/Dummy/CMakeLists.txt
source/gameengine/Physics/common/CMakeLists.txt
source/gameengine/Rasterizer/CMakeLists.txt
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
source/gameengine/SceneGraph/CMakeLists.txt
source/gameengine/VideoTexture/CMakeLists.txt
source/kernel/CMakeLists.txt

index 0e5e152..5ef37f5 100644 (file)
@@ -32,4 +32,3 @@ SET(INC
 )
 
 BLENDERLIB(bf_avi "${SRC}" "${INC}")
-#env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [90, 50] )
index 628c2dc..ab1dc3f 100644 (file)
@@ -49,7 +49,3 @@ IF(WITH_OPENMP)
 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 )
index 589c97d..2699b3b 100644 (file)
@@ -40,4 +40,3 @@ IF(WITH_QUICKTIME)
 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] )
index 36f812e..ec57c81 100644 (file)
@@ -182,10 +182,10 @@ static void id_search_cb(const bContext *C, void *arg_template, char *str, uiSea
                                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;
index 98cb3dc..57f7e83 100644 (file)
@@ -73,4 +73,3 @@ IF(WITH_DDS)
 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] )
index 588be33..cd887b6 100644 (file)
@@ -38,4 +38,3 @@ SET(INC
 )
 
 BLENDERLIB(bf_cineon "${SRC}" "${INC}")
-#env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [90, 200])
index 364dd41..64a37e0 100644 (file)
@@ -42,4 +42,3 @@ if(WITH_DDS)
 ENDIF(WITH_DDS)
 
 BLENDERLIB(bf_dds "${SRC}" "${INC}")                 
-#env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [90, 200])
index 7dc295a..1a098c8 100644 (file)
@@ -43,4 +43,3 @@ IF(WITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 BLENDERLIB(bf_openexr "${SRC}" "${INC}")                 
-#env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [90, 200])
index 14e70b8..d464005 100644 (file)
@@ -476,7 +476,7 @@ void RNA_struct_free(BlenderRNA *brna, StructRNA *srna)
 
        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);
                }
        }
 
index 2b5c8a5..63b6558 100644 (file)
@@ -52,11 +52,3 @@ SET(INC ${INC} ${QUICKTIME_INC})
 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)
index 306544f..a6522ff 100644 (file)
@@ -31,4 +31,3 @@ SET(INC
 )
 
 BLENDERLIB(bf_readblenfile "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['common','player'], priority = [0, 220] )
index 9199a0a..05f1d5d 100644 (file)
@@ -54,9 +54,4 @@ IF(APPLE)
        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 )
index 625ad00..57d2856 100644 (file)
@@ -50,4 +50,3 @@ ELSE(WITH_PYTHON)
 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)
index 26689be..97c367d 100644 (file)
@@ -70,4 +70,3 @@ ELSE(WITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_converter "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_converter', sources, Split(incs), [], libtype=['game','player'], priority=[5,70] )
index 41f771e..85b5daa 100644 (file)
@@ -43,4 +43,3 @@ ELSE(WITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_expressions "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['game','player'], priority = [45,125] )
index 3ffba14..93183da 100644 (file)
@@ -49,4 +49,3 @@ ELSE(WITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_logic "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_logic', sources, Split(incs), [], libtype=['game','player'], priority=[30, 110] )
index 418b773..08a4aa5 100644 (file)
@@ -74,4 +74,3 @@ SET(INC
 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)
index 848c2f7..8164878 100644 (file)
@@ -73,4 +73,3 @@ IF(WITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 BLENDERLIB_NOLIST(gp_ghost "${SRC}" "${INC}")
-#env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=0, compileflags=cflags)
index c4af701..d8f6e31 100644 (file)
@@ -80,4 +80,3 @@ IF(WITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 BLENDERLIB(bf_ketsji "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 72], compileflags = cflags )
index 40079f3..ce3d8fa 100644 (file)
@@ -45,4 +45,3 @@ ELSE(WITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(kx_network "${SRC}" "${INC}")
-#env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[5, 155] )
index 2478715..795e63b 100644 (file)
@@ -34,4 +34,3 @@ SET(INC
 )
 
 BLENDERLIB(bf_ngnetwork "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['game2', 'player'], priority=[15, 160] )
index 6b43a15..e7c34f5 100644 (file)
@@ -34,4 +34,3 @@ SET(INC
 )
 
 BLENDERLIB(bf_loopbacknetwork "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[25, 165] )
index 11a535b..9588896 100644 (file)
@@ -47,4 +47,3 @@ SET(INC
 )
 
 BLENDERLIB(bf_bullet "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['game','player'], priority=[15,90] )
index cb7a467..1833039 100644 (file)
@@ -32,4 +32,3 @@ SET(INC
 )
 
 BLENDERLIB(bf_dummy "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['game','player'], priority=[10,100] )
index 3618725..0f8f59f 100644 (file)
@@ -33,4 +33,3 @@ SET(INC
 )
 
 BLENDERLIB(bf_common "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['game', 'game2','player'], priority=[20, 35, 95] )
index 096b158..d718bf3 100644 (file)
@@ -43,4 +43,3 @@ SET(INC
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
 BLENDERLIB(bf_rasterizer "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115], compileflags = cflags )
index 5d6f61e..cc48952 100644 (file)
@@ -44,4 +44,3 @@ SET(INC
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
 BLENDERLIB(bf_oglrasterizer "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['game','player'], priority=[40, 120] )
index 3242ec5..a731305 100644 (file)
@@ -32,4 +32,3 @@ SET(INC
 )
 
 BLENDERLIB(bf_scenegraph "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['game','player'], priority=[50,130] )
index eaee007..3af514c 100644 (file)
@@ -64,4 +64,3 @@ ELSE(WITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_videotex "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_videotex', sources, Split(incs), [], libtype=['game','player'], priority=[25, 72], compileflags = cflags )
index 4cf3f7a..46c5ea8 100644 (file)
@@ -35,4 +35,3 @@ FILE(GLOB SRC
 )
 
 BLENDERLIB(bf_kernel "${SRC}" "${INC}")
-#env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['common','game2', 'player'], priority = [15, 10, 150] )