diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-03 12:12:55 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-03 12:12:55 +0400 |
commit | 940d1dcd0a9f88ec5a7b1ec0cf12dc7a6ddddf0b (patch) | |
tree | 05b5de462408db90fe69c268978352a2a0c3ab73 /source/blender | |
parent | 109a3b319830e6680c8d4eaf0d7076cfb1e7729c (diff) |
remove commented scons lines from cmake files, fixed use of pointer poll function for ID drobdowns (currently unused)
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/avi/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/blenpluginapi/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 4 | ||||
-rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 2 | ||||
-rw-r--r-- | source/blender/quicktime/CMakeLists.txt | 8 | ||||
-rw-r--r-- | source/blender/readblenfile/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/render/CMakeLists.txt | 5 |
12 files changed, 3 insertions, 27 deletions
diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt index 0e5e152e5c1..5ef37f5951b 100644 --- a/source/blender/avi/CMakeLists.txt +++ b/source/blender/avi/CMakeLists.txt @@ -32,4 +32,3 @@ SET(INC ) BLENDERLIB(bf_avi "${SRC}" "${INC}") -#env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [90, 50] ) diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 628c2dc43a5..ab1dc3fe909 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -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 ) diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt index 589c97d2bb6..2699b3b7c3b 100644 --- a/source/blender/blenpluginapi/CMakeLists.txt +++ b/source/blender/blenpluginapi/CMakeLists.txt @@ -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] ) diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 36f812e6206..ec57c813e20 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -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; diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 98cb3dcefd9..57f7e830f41 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -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] ) diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index 588be3305d9..cd887b6fc4e 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -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]) diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt index 364dd41e744..64a37e03a88 100644 --- a/source/blender/imbuf/intern/dds/CMakeLists.txt +++ b/source/blender/imbuf/intern/dds/CMakeLists.txt @@ -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]) diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt index 7dc295a8aae..1a098c89aa4 100644 --- a/source/blender/imbuf/intern/openexr/CMakeLists.txt +++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt @@ -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]) diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 14e70b8c249..d4640058c5c 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -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); } } diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt index 2b5c8a53e9b..63b6558e997 100644 --- a/source/blender/quicktime/CMakeLists.txt +++ b/source/blender/quicktime/CMakeLists.txt @@ -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) diff --git a/source/blender/readblenfile/CMakeLists.txt b/source/blender/readblenfile/CMakeLists.txt index 306544fec78..a6522ffa758 100644 --- a/source/blender/readblenfile/CMakeLists.txt +++ b/source/blender/readblenfile/CMakeLists.txt @@ -31,4 +31,3 @@ SET(INC ) BLENDERLIB(bf_readblenfile "${SRC}" "${INC}") -#env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['common','player'], priority = [0, 220] ) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 9199a0a33ba..05f1d5d4bd9 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -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 ) |