[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36967] branches/soc-2010-jwilkins/source/ tests/: source/tests directory was missing
Revision: 36967 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36967 Author: jwilkins Date: 2011-05-28 06:18:05 + (Sat, 28 May 2011) Log Message: --- source/tests directory was missing Added Paths: --- branches/soc-2010-jwilkins/source/tests/ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36966] trunk/blender: include ffmpeg_compat header in cmake source list.
Revision: 36966
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36966
Author: campbellbarton
Date: 2011-05-28 04:53:17 + (Sat, 28 May 2011)
Log Message:
---
include ffmpeg_compat header in cmake source list.
Modified Paths:
--
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/imbuf/CMakeLists.txt
Modified: trunk/blender/build_files/cmake/macros.cmake
===
--- trunk/blender/build_files/cmake/macros.cmake2011-05-28 03:18:40 UTC
(rev 36965)
+++ trunk/blender/build_files/cmake/macros.cmake2011-05-28 04:53:17 UTC
(rev 36966)
@@ -13,19 +13,13 @@
include_directories(${all_incs})
endmacro()
-# only MSVC uses SOURCE_GROUP
-macro(blender_add_lib_nolist
- name
- sources
- includes)
- # message(STATUS "Configuring library ${name}")
+macro(blender_source_group
+ sources)
- blender_include_dirs("${includes}")
- add_library(${name} ${sources})
-
# Group by location on disk
source_group("Source Files" FILES CMakeLists.txt)
+
foreach(SRC ${sources})
get_filename_component(SRC_EXT ${SRC} EXT)
if(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp")
@@ -36,17 +30,27 @@
endforeach()
endmacro()
-# # works fine but having the includes listed is helpful for IDE's
(QtCreator/MSVC)
-# macro(blender_add_lib_nolist
-# name
-# sources
-# includes)
-#
-# message(STATUS "Configuring library ${name}")
-# include_directories(${includes})
-# add_library(${name} ${sources})
-# endmacro()
+# only MSVC uses SOURCE_GROUP
+macro(blender_add_lib_nolist
+ name
+ sources
+ includes)
+
+ # message(STATUS "Configuring library ${name}")
+
+ # include_directories(${includes})
+ blender_include_dirs("${includes}")
+
+ add_library(${name} ${sources})
+
+ # works fine without having the includes
+ # listed is helpful for IDE's (QtCreator/MSVC)
+ blender_source_group("${sources}")
+
+endmacro()
+
+
macro(blender_add_lib
name
sources
@@ -55,9 +59,9 @@
blender_add_lib_nolist(${name} "${sources}" "${includes}")
set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
-
endmacro()
+
macro(SETUP_LIBDIRS)
# see "cmake --help-policy CMP0003"
if(COMMAND cmake_policy)
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-05-28
03:18:40 UTC (rev 36965)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-05-28
04:53:17 UTC (rev 36966)
@@ -444,7 +444,6 @@
static int gp_camera_view_subrect(bContext *C, rctf *subrect)
{
- Scene *scene= CTX_data_scene(C);
View3D *v3d= CTX_wm_view3d(C);
ARegion *ar= CTX_wm_region(C);
@@ -453,6 +452,7 @@
/* for camera view set the subrect */
if (rv3d->persp == RV3D_CAMOB) {
+ Scene *scene= CTX_data_scene(C);
ED_view3d_calc_camera_border(scene, ar, v3d, rv3d,
subrect, -1); /* negative shift */
return 1;
}
Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===
--- trunk/blender/source/blender/imbuf/CMakeLists.txt 2011-05-28 03:18:40 UTC
(rev 36965)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt 2011-05-28 04:53:17 UTC
(rev 36966)
@@ -101,6 +101,9 @@
intern/md5.h
intern/openexr/openexr_api.h
intern/openexr/openexr_multi.h
+
+ # orphan include
+ ../../../intern/ffmpeg/ffmpeg_compat.h
)
if(WITH_IMAGE_OPENEXR)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36965] branches/soc-2010-jwilkins: Merge Cleanup.
Revision: 36965 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36965 Author: jwilkins Date: 2011-05-28 03:18:40 + (Sat, 28 May 2011) Log Message: --- Merge Cleanup. Forth to make sure branch is a copy of trunk. This time the revision is 36950. Mostly svn property fixes. Biggest concern was missing 'svn:eol-style = native' tags, but also a lot of random 'svn:mergeinfo=' tages (yes, the merge info was empty). Probably need to remove these in trunk, but I added them back to clean up my diff. Modified Paths: -- branches/soc-2010-jwilkins/release/scripts/modules/sys_info.py branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_NTSC_1080p.py branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_PAL_1080p.py branches/soc-2010-jwilkins/source/SConscript branches/soc-2010-jwilkins/source/blender/blenlib/BLI_cpu.h branches/soc-2010-jwilkins/source/blender/blenlib/intern/cpu.c branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_undo.c branches/soc-2010-jwilkins/source/blender/editors/space_info/info_draw.c branches/soc-2010-jwilkins/source/blender/editors/space_info/info_report.c branches/soc-2010-jwilkins/source/blender/editors/space_info/textview.c branches/soc-2010-jwilkins/source/blender/editors/space_info/textview.h branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_fly.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer_api.c branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_geometry.c branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_geometry.h branches/soc-2010-jwilkins/source/blenderplayer/CMakeLists.txt Property Changed: branches/soc-2010-jwilkins/intern/ghost/GHOST_Path-api.h branches/soc-2010-jwilkins/release/scripts/modules/bpy/ops.py branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py branches/soc-2010-jwilkins/release/scripts/modules/sys_info.py branches/soc-2010-jwilkins/release/scripts/op/ branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_NTSC_1080p.py branches/soc-2010-jwilkins/release/scripts/presets/render/HDV_PAL_1080p.py branches/soc-2010-jwilkins/release/scripts/presets/sss/chicken.py branches/soc-2010-jwilkins/release/scripts/presets/sss/cream.py branches/soc-2010-jwilkins/release/scripts/presets/sss/ketchup.py branches/soc-2010-jwilkins/release/scripts/presets/sss/marble.py branches/soc-2010-jwilkins/release/scripts/presets/sss/potato.py branches/soc-2010-jwilkins/release/scripts/presets/sss/skim_milk.py branches/soc-2010-jwilkins/release/scripts/presets/sss/skin1.py branches/soc-2010-jwilkins/release/scripts/presets/sss/skin2.py branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/add_mesh_torus.py branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/uvcalc_smart_project.py branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/vertexpaint_dirt.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_armature.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_bone.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_camera.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_empty.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_lamp.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_lattice.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_mesh.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_metaball.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_modifier.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_game.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_material.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_particle.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_field.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_fluid.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_physics_smoke.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_texture.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_world.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_node.py branches/soc-2010-jwilkins/release/scripts/ui/ branches/soc-2010-jwilkins/source/blender/blenlib/BLI_cpu.h branches/soc-2010-jwilkins/source/blender/blenlib/intern/cpu.c branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c branches/soc-2010-jwilkins/source/blender/editors/include/ED_parti
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36964] trunk/blender/source/gameengine/ BlenderRoutines/BL_KetsjiEmbedStart.cpp: fix for embeded BGE viewport broken when not using letterboxing
Revision: 36964
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36964
Author: dfelinto
Date: 2011-05-28 01:29:56 + (Sat, 28 May 2011)
Log Message:
---
fix for embeded BGE viewport broken when not using letterboxing
this was broken after rev.36787 (api rewritten)
own reported bug, nowhere in the track (just to mess up with the bug fixing
statistics)
Modified Paths:
--
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
Modified:
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2011-05-28 00:07:33 UTC (rev 36963)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2011-05-28 01:29:56 UTC (rev 36964)
@@ -258,7 +258,7 @@
draw_letterbox = 1;
}
else {
- camzoom =
BKE_screen_view3d_zoom_to_fac(rv3d->camzoom);
+ camzoom =
BKE_screen_view3d_zoom_to_fac(rv3d->camzoom)*4.0f;
}
}
else {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36963] trunk/blender/intern/ffmpeg/ ffmpeg_compat.h: == FFMPEG ==
Revision: 36963 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36963 Author: schlaile Date: 2011-05-28 00:07:33 + (Sat, 28 May 2011) Log Message: --- == FFMPEG == Small fix for a very old bug in swscaler color space support detection. Modified Paths: -- trunk/blender/intern/ffmpeg/ffmpeg_compat.h Modified: trunk/blender/intern/ffmpeg/ffmpeg_compat.h === --- trunk/blender/intern/ffmpeg/ffmpeg_compat.h 2011-05-27 23:51:40 UTC (rev 36962) +++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h 2011-05-28 00:07:33 UTC (rev 36963) @@ -61,8 +61,8 @@ #define FFMPEG_HAVE_AVMEDIA_TYPES 1 #endif -#if (LIBAVCODEC_VERSION_MAJOR >= 52) && (LIBAVCODEC_VERSION_MINOR >= 29) && \ -(LIBSWSCALE_VERSION_MAJOR >= 0) && (LIBSWSCALE_VERSION_MINOR >= 10) +#if ((LIBAVCODEC_VERSION_MAJOR > 52) || (LIBAVCODEC_VERSION_MAJOR >= 52) && (LIBAVCODEC_VERSION_MINOR >= 29)) && \ + ((LIBSWSCALE_VERSION_MAJOR > 0) || (LIBSWSCALE_VERSION_MAJOR >= 0) && (LIBSWSCALE_VERSION_MINOR >= 10)) #define FFMPEG_SWSCALE_COLOR_SPACE_SUPPORT #endif ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36962] trunk/blender/intern/ffmpeg/ ffmpeg_compat.h: SVN maintenance.
Revision: 36962 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36962 Author: gsrb3d Date: 2011-05-27 23:51:40 + (Fri, 27 May 2011) Log Message: --- SVN maintenance. Property Changed: trunk/blender/intern/ffmpeg/ffmpeg_compat.h Property changes on: trunk/blender/intern/ffmpeg/ffmpeg_compat.h ___ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36961] trunk/blender/source/gameengine/ VideoTexture/VideoFFmpeg.cpp: == FFMPEG ==
Revision: 36961 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36961 Author: schlaile Date: 2011-05-27 23:46:47 + (Fri, 27 May 2011) Log Message: --- == FFMPEG == Revert of "SVN commit: /data/svn/bf-blender [36957] trunk/blender/source/gameengine/ VideoTexture/VideoFFmpeg.cpp: fix for ffmpeg linking in BGE ( patch by Jens Verwiebe (jensverwiebe) over IRC)" Sorry folks, that patch breaks current ffmpeg GIT version. Good news: it's all handled now automagically by ffmpeg_compat.h in intern/ffmpeg so: everything should be fine and dandy for very old and very new versions. Modified Paths: -- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp === --- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp 2011-05-27 23:33:40 UTC (rev 36960) +++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp 2011-05-27 23:46:47 UTC (rev 36961) @@ -641,7 +641,7 @@ if (m_captRate <= 0.f) m_captRate = defFrameRate; sprintf(rateStr, "%f", m_captRate); - av_parse_video_frame_rate(&frameRate, rateStr); + av_parse_video_rate(&frameRate, rateStr); // populate format parameters // need to specify the time base = inverse of rate formatParams.time_base.num = frameRate.den; ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36960] trunk/blender: == FFMPEG ==
Revision: 36960
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36960
Author: schlaile
Date: 2011-05-27 23:33:40 + (Fri, 27 May 2011)
Log Message:
---
== FFMPEG ==
Added central compatibility header file, which enables blender to compile
against very old ffmpeg versions as well as very new versions using the
*NEW* API. (Old API functions are simulated using macros and inline functions)
Added a whole lot of additional checks, tested against 6 different versions
down the timeline, hopefully, now finally all is well.
Modified Paths:
--
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/audaspace/SConscript
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/imbuf/SConscript
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
trunk/blender/source/gameengine/VideoTexture/SConscript
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
Added Paths:
---
trunk/blender/intern/ffmpeg/
trunk/blender/intern/ffmpeg/ffmpeg_compat.h
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===
--- trunk/blender/intern/audaspace/CMakeLists.txt 2011-05-27 22:21:14 UTC
(rev 36959)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2011-05-27 23:33:40 UTC
(rev 36960)
@@ -26,6 +26,7 @@
FX SRC
${PTHREADS_INC}
${LIBSAMPLERATE_INC}
+ ../ffmpeg
)
set(SRC
Modified: trunk/blender/intern/audaspace/SConscript
===
--- trunk/blender/intern/audaspace/SConscript 2011-05-27 22:21:14 UTC (rev
36959)
+++ trunk/blender/intern/audaspace/SConscript 2011-05-27 23:33:40 UTC (rev
36960)
@@ -8,7 +8,7 @@
if env['WITH_BF_FFMPEG']:
sources += env.Glob('ffmpeg/*.cpp')
-incs += ' ffmpeg ' + env['BF_FFMPEG_INC']
+incs += ' ffmpeg #/intern/ffmpeg ' + env['BF_FFMPEG_INC']
defs.append('WITH_FFMPEG')
if env['WITH_BF_SDL']:
Modified: trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===
--- trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2011-05-27
22:21:14 UTC (rev 36959)
+++ trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2011-05-27
23:33:40 UTC (rev 36960)
@@ -39,6 +39,7 @@
extern "C" {
#include
#include
+#include "ffmpeg_compat.h"
}
int AUD_FFMPEGReader::decode(AVPacket* packet, AUD_Buffer& buffer)
Added: trunk/blender/intern/ffmpeg/ffmpeg_compat.h
===
--- trunk/blender/intern/ffmpeg/ffmpeg_compat.h (rev 0)
+++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h 2011-05-27 23:33:40 UTC (rev
36960)
@@ -0,0 +1,133 @@
+#ifndef __ffmpeg_compat_h_included__
+#define __ffmpeg_compat_h_included__ 1
+
+/*
+ * $Id$
+ *
+ * compatibility macros to make every ffmpeg installation appear
+ * like the most current installation (wrapping some functionality sometimes)
+ * it also includes all ffmpeg header files at once, no need to do it
+ * seperately.
+ *
+ * Copyright (c) 2011 Peter Schlaile
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+
+#include
+#include
+#include
+
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) &&
(LIBAVFORMAT_VERSION_MINOR >= 101))
+#define FFMPEG_HAVE_PARSE_UTILS 1
+#include
+#endif
+
+#include
+#include
+
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) &&
(LIBAVFORMAT_VERSION_MINOR >= 105))
+#define FFMPEG_HAVE_AVIO 1
+#endif
+
+#if (LIBAVFORMAT_VERSION_MAJOR > 53) || ((LIBAVFORMAT_VERSION_MAJOR >= 53) &&
(LIBAVFORMAT_VERSION_MINOR >= 1))
+#define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
+#endif
+
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) &&
(LIBAVFORMAT_VERSION_MINOR >= 101))
+#define FFMPEG_HAVE_AV_DUMP_FORMAT 1
+#endif
+
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) &&
(LIBAVFORMAT_VERSION_MINOR >= 45))
+#define FFMPEG_HAVE_AV_GUESS_FORMAT 1
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36959] branches/soc-2011-onion: svn merge with trunk r36957
Revision: 36959 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36959 Author: psy-fi Date: 2011-05-27 22:21:14 + (Fri, 27 May 2011) Log Message: --- svn merge with trunk r36957 Revision Links: -- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36957 Modified Paths: -- branches/soc-2011-onion/build_files/cmake/cmake_netbeans_project.py branches/soc-2011-onion/build_files/cmake/cmake_qtcreator_project.py branches/soc-2011-onion/build_files/cmake/project_info.py branches/soc-2011-onion/build_files/scons/tools/Blender.py branches/soc-2011-onion/build_files/scons/tools/btools.py branches/soc-2011-onion/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py branches/soc-2011-onion/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp branches/soc-2011-onion/release/scripts/modules/bpy_extras/mesh_utils.py branches/soc-2011-onion/release/scripts/modules/bpy_extras/view3d_utils.py branches/soc-2011-onion/release/scripts/modules/bpy_types.py branches/soc-2011-onion/release/scripts/startup/bl_operators/mesh.py branches/soc-2011-onion/release/scripts/startup/bl_operators/uvcalc_follow_active.py branches/soc-2011-onion/release/scripts/startup/bl_operators/wm.py branches/soc-2011-onion/release/scripts/startup/bl_ui/__init__.py branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_empty.py branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_object_constraint.py branches/soc-2011-onion/release/scripts/startup/bl_ui/space_image.py branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref.py branches/soc-2011-onion/release/windows/installer/00.sconsblender.nsi branches/soc-2011-onion/source/blender/blenkernel/intern/anim_sys.c branches/soc-2011-onion/source/blender/blenkernel/intern/image.c branches/soc-2011-onion/source/blender/blenkernel/intern/object.c branches/soc-2011-onion/source/blender/blenkernel/intern/writeffmpeg.c branches/soc-2011-onion/source/blender/blenlib/BLI_path_util.h branches/soc-2011-onion/source/blender/blenlib/BLI_string.h branches/soc-2011-onion/source/blender/blenlib/intern/math_color.c branches/soc-2011-onion/source/blender/blenlib/intern/path_util.c branches/soc-2011-onion/source/blender/blenlib/intern/string.c branches/soc-2011-onion/source/blender/blenloader/BLO_readfile.h branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c branches/soc-2011-onion/source/blender/editors/animation/keyingsets.c branches/soc-2011-onion/source/blender/editors/armature/editarmature_sketch.c branches/soc-2011-onion/source/blender/editors/armature/poselib.c branches/soc-2011-onion/source/blender/editors/gpencil/gpencil_edit.c branches/soc-2011-onion/source/blender/editors/gpencil/gpencil_paint.c branches/soc-2011-onion/source/blender/editors/include/ED_keyframing.h branches/soc-2011-onion/source/blender/editors/interface/interface.c branches/soc-2011-onion/source/blender/editors/mesh/editmesh_mods.c branches/soc-2011-onion/source/blender/editors/mesh/editmesh_tools.c branches/soc-2011-onion/source/blender/editors/object/object_edit.c branches/soc-2011-onion/source/blender/editors/object/object_hook.c branches/soc-2011-onion/source/blender/editors/object/object_modifier.c branches/soc-2011-onion/source/blender/editors/object/object_relations.c branches/soc-2011-onion/source/blender/editors/object/object_vgroup.c branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c branches/soc-2011-onion/source/blender/editors/space_file/space_file.c branches/soc-2011-onion/source/blender/editors/space_view3d/view3d_draw.c branches/soc-2011-onion/source/blender/imbuf/intern/anim_movie.c branches/soc-2011-onion/source/blender/imbuf/intern/util.c branches/soc-2011-onion/source/blender/makesrna/RNA_access.h branches/soc-2011-onion/source/blender/makesrna/RNA_define.h branches/soc-2011-onion/source/blender/makesrna/RNA_enum_types.h branches/soc-2011-onion/source/blender/makesrna/RNA_types.h branches/soc-2011-onion/source/blender/makesrna/intern/makesrna.c branches/soc-2011-onion/source/blender/makesrna/intern/rna_access.c branches/soc-2011-onion/source/blender/makesrna/intern/rna_actuator.c branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c branches/soc-2011-onion/source/blender/makesrna/intern/rna_constraint.c branches/soc-2011-onion/source/blender/makesrna/intern/rna_define.c branches/soc-2011-onion/source/blender/makesrna/intern/rna_image.c branches/soc-2011-onion/source/blender/makesrna/intern/rna_internal_types.h branches/soc-2011-onion/source/blender/makesrna/intern/rna_material.c branches/soc-2011-onion/source/blender/makesrna/intern/rna_nodetree.c branches/soc-2011-onion
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36958] branches/soc-2011-onion: GSOC 2011 - onion branch
Revision: 36958
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36958
Author: psy-fi
Date: 2011-05-27 21:46:10 + (Fri, 27 May 2011)
Log Message:
---
GSOC 2011 - onion branch
--High resolution Textures--
Added user preferences option under System->OpenGL to control behavior
Modified Paths:
--
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-onion/source/blender/editors/interface/resources.c
branches/soc-2011-onion/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-onion/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-onion/source/blender/makesrna/intern/rna_userdef.c
Modified:
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref.py
===
--- branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref.py
2011-05-27 21:13:44 UTC (rev 36957)
+++ branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref.py
2011-05-27 21:46:10 UTC (rev 36958)
@@ -438,6 +438,7 @@
col.label(text="OpenGL:")
col.prop(system, "gl_clip_alpha", slider=True)
col.prop(system, "use_mipmaps")
+col.prop(system, "use_highres_tex")
col.prop(system, "use_vertex_buffer_objects")
#Anti-aliasing is disabled as it breaks broder/lasso select
#col.prop(system, "use_antialiasing")
Modified: branches/soc-2011-onion/source/blender/editors/interface/resources.c
===
--- branches/soc-2011-onion/source/blender/editors/interface/resources.c
2011-05-27 21:13:44 UTC (rev 36957)
+++ branches/soc-2011-onion/source/blender/editors/interface/resources.c
2011-05-27 21:46:10 UTC (rev 36958)
@@ -1552,6 +1552,9 @@
U.autokey_flag &= ~AUTOKEY_FLAG_ONLYKEYINGSET;
}
+ if (bmain->versionfile < 258)
+ U.hirestex = 0;
+
/* GL Texture Garbage Collection (variable abused above!) */
if (U.textimeout == 0) {
U.texcollectrate = 60;
Modified: branches/soc-2011-onion/source/blender/gpu/intern/gpu_draw.c
===
--- branches/soc-2011-onion/source/blender/gpu/intern/gpu_draw.c
2011-05-27 21:13:44 UTC (rev 36957)
+++ branches/soc-2011-onion/source/blender/gpu/intern/gpu_draw.c
2011-05-27 21:46:10 UTC (rev 36958)
@@ -464,7 +464,7 @@
if (ibuf->rect_float){
/*replace with user preference when ready :)*/
- if(1)
+ if(U.hirestex)
{
/*Use high precision textures. This is relatively
harmless because OpenGL gives us
a high precision format only if it is available*/
Modified: branches/soc-2011-onion/source/blender/makesdna/DNA_userdef_types.h
===
--- branches/soc-2011-onion/source/blender/makesdna/DNA_userdef_types.h
2011-05-27 21:13:44 UTC (rev 36957)
+++ branches/soc-2011-onion/source/blender/makesdna/DNA_userdef_types.h
2011-05-27 21:46:10 UTC (rev 36958)
@@ -374,7 +374,7 @@
short scrcastfps; /* frame rate for screencast to be
played back */
short scrcastwait; /* milliseconds between screencast
snapshots */
- short pad8, pad[3]; /* Value for Dual/Single Column UI */
+ short hirestex, pad[3]; /* Value for Dual/Single Column UI */
char versemaster[160];
char verseuser[160];
Modified: branches/soc-2011-onion/source/blender/makesrna/intern/rna_userdef.c
===
--- branches/soc-2011-onion/source/blender/makesrna/intern/rna_userdef.c
2011-05-27 21:13:44 UTC (rev 36957)
+++ branches/soc-2011-onion/source/blender/makesrna/intern/rna_userdef.c
2011-05-27 21:46:10 UTC (rev 36958)
@@ -116,6 +116,14 @@
rna_userdef_update(bmain, scene, ptr);
}
+static void rna_userdef_gl_use_texture_highres(Main *bmain, Scene *scene,
PointerRNA *ptr)
+{
+ GPU_free_images();
+ rna_userdef_update(bmain, scene, ptr);
+}
+
+
+
static void rna_userdef_select_mouse_set(PointerRNA *ptr,int value)
{
UserDef *userdef = (UserDef*)ptr->data;
@@ -2547,6 +2555,11 @@
RNA_def_property_ui_text(prop, "Mipmaps", "Scale textures for the 3D
View (looks nicer but uses more memory and slows image reloading)");
RNA_def_property_update(prop, 0, "rna_userdef_mipmap_update");
+ prop= RNA_def_property(srna, "use_highres_tex", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "hirestex", 1);
+ RNA_def_property_ui_text(prop, "High Resolution Float Textures", "Use
16 bit texture for float images.");
+ RNA_def_property_update(prop, 0, "rna_userdef_gl_use_
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36957] trunk/blender/source/gameengine/ VideoTexture/VideoFFmpeg.cpp: fix for ffmpeg linking in BGE ( patch by Jens Verwiebe (jensverwiebe) over IRC)
Revision: 36957 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36957 Author: dfelinto Date: 2011-05-27 21:13:44 + (Fri, 27 May 2011) Log Message: --- fix for ffmpeg linking in BGE (patch by Jens Verwiebe (jensverwiebe) over IRC) - av_parse_video_rate(&frameRate, rateStr); + av_parse_video_frame_rate(&frameRate, rateStr); Modified Paths: -- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp === --- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp 2011-05-27 20:57:46 UTC (rev 36956) +++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp 2011-05-27 21:13:44 UTC (rev 36957) @@ -641,7 +641,7 @@ if (m_captRate <= 0.f) m_captRate = defFrameRate; sprintf(rateStr, "%f", m_captRate); - av_parse_video_rate(&frameRate, rateStr); + av_parse_video_frame_rate(&frameRate, rateStr); // populate format parameters // need to specify the time base = inverse of rate formatParams.time_base.num = frameRate.den; ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36956] trunk/lib/windows/ffmpeg: ffmpeg 0 .6.3 libraries for win32 platform
Revision: 36956
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36956
Author: nazgul
Date: 2011-05-27 20:57:46 + (Fri, 27 May 2011)
Log Message:
---
ffmpeg 0.6.3 libraries for win32 platform
Modified Paths:
--
trunk/lib/windows/ffmpeg/Readme.txt
trunk/lib/windows/ffmpeg/include/libavcodec/avcodec.h
trunk/lib/windows/ffmpeg/include/libavformat/avformat.h
trunk/lib/windows/ffmpeg/include/libavutil/avutil.h
trunk/lib/windows/ffmpeg/include/libavutil/common.h
trunk/lib/windows/ffmpeg/include/libavutil/error.h
trunk/lib/windows/ffmpeg/include/libavutil/log.h
trunk/lib/windows/ffmpeg/include/libavutil/pixfmt.h
trunk/lib/windows/ffmpeg/include/libswscale/swscale.h
trunk/lib/windows/ffmpeg/lib/avcodec-52.dll
trunk/lib/windows/ffmpeg/lib/avcodec-52.lib
trunk/lib/windows/ffmpeg/lib/avdevice-52.dll
trunk/lib/windows/ffmpeg/lib/avdevice-52.lib
trunk/lib/windows/ffmpeg/lib/avformat-52.dll
trunk/lib/windows/ffmpeg/lib/avformat-52.lib
trunk/lib/windows/ffmpeg/lib/avutil-50.dll
trunk/lib/windows/ffmpeg/lib/avutil-50.lib
trunk/lib/windows/ffmpeg/lib/swscale-0.dll
trunk/lib/windows/ffmpeg/lib/swscale-0.lib
Modified: trunk/lib/windows/ffmpeg/Readme.txt
===
--- trunk/lib/windows/ffmpeg/Readme.txt 2011-05-27 20:55:14 UTC (rev 36955)
+++ trunk/lib/windows/ffmpeg/Readme.txt 2011-05-27 20:57:46 UTC (rev 36956)
@@ -1,8 +1,10 @@
-This directory contains r22941 from http://ffmpeg.arrozcru.org/autobuilds/
(April 22nd, 2010)
+This directory contains ffmpeg library v0.6.3 from
http://www.ffmpeg.org/releases/ (April 26nd, 2011)
+Compiled by Sergey Sharybin in msys environment
-Some quick mods:
+Quick notes
+===
-1. rename the .lib files according to .dll naming (include version number)
+1. Compile ffmpeg libraries and copy include files and libs here
2. put stdint.h and inttypes.h in subfolder msvc to prevent conflicts with
mingw
3. add to libavutil\common.h after line 53
#define inline __inline
@@ -12,3 +14,209 @@
typedef signed __int16int16_t;
typedef signed __int32int32_t;
typedef signed __int64int64_t;
+5. There were some problems with linking blender against installed dll-s which
+ were solved by manual stripping dll (strip --strip-unneeded --strip-debug)
+ and generating .lib-files for them
+
+Environment configuration
+=
+
+1. Used 32 bit mingw/msys environment using this installer:
+
http://sourceforge.net/projects/mingw/files/Automated%20MinGW%20Installer/mingw-get-inst
+2. Used gcc-4.4.0 due to some incompatibilities between used libraries and
newer compilers
+
http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/Previous%20Release%20gcc-4.4.0/
+3. Also used yasm: http://www.tortall.net/projects/yasm/wiki/Download
+4. Used pthread library frmo mingw-w64 sourceforge files download page
+
+Libraries configuration scripts
+===
+
+ffmpeg configuration
+
+
+LIBS="/home/sergey/lib"
+
+./configure \
+--prefix=/home/sergey/lib/ffmpeg \
+--enable-shared \
+--disable-static \
+--disable-avfilter \
+--disable-vdpau \
+--disable-bzlib \
+--disable-libgsm \
+--enable-libschroedinger \
+--disable-libspeex \
+--enable-libtheora \
+--enable-libvorbis \
+--disable-zlib \
+--enable-libvpx \
+--enable-libfaad \
+--enable-stripping \
+--enable-runtime-cpudetect \
+--disable-vaapi \
+--enable-libopenjpeg \
+--disable-libfaac \
+--disable-nonfree \
+--enable-gpl \
+--disable-postproc \
+--disable-x11grab \
+--enable-libdirac \
+--enable-libmp3lame \
+--disable-librtmp \
+--enable-libx264 \
+--enable-libxvid \
+--disable-libopencore-amrnb \
+--disable-libopencore-amrwb \
+--disable-libdc1394 \
+--disable-version3 \
+--disable-debug \
+--enable-w32threads \
+--enable-memalign-hack \
+--extra-cflags="-g -Wall -Wextra -I${LIBS}/lame/include
-I${LIBS}/openjpeg/include -I${LIBS}/ogg/include -I${LIBS}/vorbis/include
-I${LIBS}/theora/include -I${LIBS}/vpx/include -I${LIBS}/x264/include
-I${LIBS}/xvid/include -I${LIBS}/dirac/include/dirac
-I${LIBS}/schroedinger/include/schroedinger-1.0 -I${LIBS}/faad/include" \
+--extra-ldflags="-Wl,--as-needed -static-libgcc -L${LIBS}/lame/lib
-L${LIBS}/openjpeg/lib -L${LIBS}/ogg/lib -L${LIBS}/vorbis/lib
-L${LIBS}/theora/lib -L${LIBS}/vpx/lib -L${LIBS}/x264/lib -L${LIBS}/xvid/lib
-L${LIBS}/dirac/lib -L${LIBS}/schroedinger/lib -L${LIBS}/orc/lib
-L${LIBS}/faad/lib"
+
+dirac configuration
+---
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure --prefix=/home/sergey/lib/dirac \
+--disable-shared \
+--enable-static
+
+faad configuration
+--
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36955] trunk/lib/win64/ffmpeg: ffmpeg 0.6 .3 libraries for win64 platform
Revision: 36955
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36955
Author: nazgul
Date: 2011-05-27 20:55:14 + (Fri, 27 May 2011)
Log Message:
---
ffmpeg 0.6.3 libraries for win64 platform
Modified Paths:
--
trunk/lib/win64/ffmpeg/include/libavcodec/avcodec.h
trunk/lib/win64/ffmpeg/include/libavformat/avformat.h
trunk/lib/win64/ffmpeg/include/libavutil/avutil.h
trunk/lib/win64/ffmpeg/include/libavutil/common.h
trunk/lib/win64/ffmpeg/include/libavutil/error.h
trunk/lib/win64/ffmpeg/include/libavutil/log.h
trunk/lib/win64/ffmpeg/include/libavutil/pixfmt.h
trunk/lib/win64/ffmpeg/include/libswscale/swscale.h
trunk/lib/win64/ffmpeg/lib/avcodec-52.dll
trunk/lib/win64/ffmpeg/lib/avcodec-52.lib
trunk/lib/win64/ffmpeg/lib/avdevice-52.dll
trunk/lib/win64/ffmpeg/lib/avdevice-52.lib
trunk/lib/win64/ffmpeg/lib/avformat-52.dll
trunk/lib/win64/ffmpeg/lib/avformat-52.lib
trunk/lib/win64/ffmpeg/lib/avutil-50.dll
trunk/lib/win64/ffmpeg/lib/avutil-50.lib
trunk/lib/win64/ffmpeg/lib/swscale-0.dll
trunk/lib/win64/ffmpeg/lib/swscale-0.lib
Added Paths:
---
trunk/lib/win64/ffmpeg/Readme.txt
Removed Paths:
-
trunk/lib/win64/ffmpeg/version.txt
Added: trunk/lib/win64/ffmpeg/Readme.txt
===
--- trunk/lib/win64/ffmpeg/Readme.txt (rev 0)
+++ trunk/lib/win64/ffmpeg/Readme.txt 2011-05-27 20:55:14 UTC (rev 36955)
@@ -0,0 +1,216 @@
+This directory contains ffmpeg library v0.6.3 from
http://www.ffmpeg.org/releases/ (April 26nd, 2011)
+Compiled by Sergey Sharybin in msys environment
+
+Quick notes
+===
+
+1. Compile ffmpeg libraries and copy include files and libs here
+2. put stdint.h and inttypes.h in subfolder msvc to prevent conflicts with
mingw
+3. add to libavutil\common.h after line 53
+ #define inline __inline
+4. modify stdint.h to make it compatible with MSVC C++ headers:
+Add signed to int8_t, int16_t, int32_t, int64_t:
+ typedef signed __int8 int8_t;
+ typedef signed __int16int16_t;
+ typedef signed __int32int32_t;
+ typedef signed __int64int64_t;
+
+Environment configuration
+=
+
+1. Used 64 bit mingw/msys environment: http://mingw-w64.sourceforge.net/
+2. Used gcc-4.4.7 due to some incompatibilities between used libraries and
newer compilers
+3. Also used yasm: http://www.tortall.net/projects/yasm/wiki/Download
+4. Used pthread library frmo mingw-w64 sourceforge files download page
+
+Libraries configuration scripts
+===
+
+ffmpeg configuration
+
+
+LIBS="/home/sergey/lib"
+
+./configure \
+--prefix=/home/sergey/lib/ffmpeg \
+--enable-shared \
+--disable-static \
+--disable-avfilter \
+--disable-vdpau \
+--disable-bzlib \
+--disable-libgsm \
+--enable-libschroedinger \
+--disable-libspeex \
+--enable-libtheora \
+--enable-libvorbis \
+--disable-zlib \
+--enable-libvpx \
+--enable-libfaad \
+--enable-stripping \
+--enable-runtime-cpudetect \
+--disable-vaapi \
+--enable-libopenjpeg \
+--disable-libfaac \
+--disable-nonfree \
+--enable-gpl \
+--disable-postproc \
+--disable-x11grab \
+--enable-libdirac \
+--enable-libmp3lame \
+--disable-librtmp \
+--enable-libx264 \
+--enable-libxvid \
+--disable-libopencore-amrnb \
+--disable-libopencore-amrwb \
+--disable-libdc1394 \
+--disable-version3 \
+--disable-debug \
+--enable-w32threads \
+--extra-cflags="-g -Wall -Wextra -I${LIBS}/lame/include
-I${LIBS}/openjpeg/include -I${LIBS}/ogg/include -I${LIBS}/vorbis/include
-I${LIBS}/theora/include -I${LIBS}/vpx/include -I${LIBS}/x264/include
-I${LIBS}/xvid/include -I${LIBS}/dirac/include/dirac
-I${LIBS}/schroedinger/include/schroedinger-1.0 -I${LIBS}/faad/include" \
+--extra-ldflags="-Wl,--as-needed -static-libgcc -L${LIBS}/lame/lib
-L${LIBS}/openjpeg/lib -L${LIBS}/ogg/lib -L${LIBS}/vorbis/lib
-L${LIBS}/theora/lib -L${LIBS}/vpx/lib -L${LIBS}/x264/lib -L${LIBS}/xvid/lib
-L${LIBS}/dirac/lib -L${LIBS}/schroedinger/lib -L${LIBS}/orc/lib
-L${LIBS}/faad/lib"
+
+dirac configuration
+---
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure --prefix=/home/sergey/lib/dirac \
+--disable-shared \
+--enable-static
+
+faad configuration
+--
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure --prefix=/home/sergey/lib/faad \
+--disable-shared \
+--enable-static
+
+lame configuration
+--
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure --prefix=/home/sergey/lib/lame \
+--disable-shared \
+--enable-static \
+--enable-e
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36954] branches/soc-2011-radish:
Revision: 36954
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36954
Author: jason_hays22
Date: 2011-05-27 19:13:54 + (Fri, 27 May 2011)
Log Message:
---
Modified Paths:
--
branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-radish/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-radish/source/blender/makesrna/intern/rna_object.c
Modified:
branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_mesh.py
===
---
branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_mesh.py
2011-05-27 17:59:48 UTC (rev 36953)
+++
branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_mesh.py
2011-05-27 19:13:54 UTC (rev 36954)
@@ -127,7 +127,8 @@
ob = context.object
group = ob.vertex_groups.active
-
+
+
rows = 2
if group:
rows = 5
@@ -136,6 +137,8 @@
row.template_list(ob, "vertex_groups", ob.vertex_groups,
"active_index", rows=rows)
col = row.column(align=True)
+# Jason was here #
+col.prop(group, "flag")
col.operator("object.vertex_group_add", icon='ZOOMIN', text="")
col.operator("object.vertex_group_remove", icon='ZOOMOUT', text="")
col.menu("MESH_MT_vertex_group_specials", icon='DOWNARROW_HLT',
text="")
Modified:
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c
===
--- branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c
2011-05-27 17:59:48 UTC (rev 36953)
+++ branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c
2011-05-27 19:13:54 UTC (rev 36954)
@@ -73,6 +73,7 @@
#include "BKE_object.h"
#include "BKE_paint.h"
+
#include "WM_api.h"
#include "WM_types.h"
@@ -346,7 +347,6 @@
DAG_id_tag_update(&me->id, 0);
}
-
/* fills in the selected faces with the current weight and vertex group */
void wpaint_fill(VPaint *wp, Object *ob, float paintweight)
{
@@ -362,7 +362,7 @@
me= ob->data;
if(me==NULL || me->totface==0 || me->dvert==NULL || !me->mface) return;
-
+
selected= (me->editflag & ME_EDIT_PAINT_MASK);
indexar= get_indexarray(me);
@@ -1029,6 +1029,74 @@
}
}
+/*Jason was here
+not sure where these prototypes belong at them moment
+static char* gen_lck_flags(Object* ob);
+static void fix_weight_ratios(Mesh *me, MDeformWeight *pnt_dw, float oldw);
+
+gen_lck_flags gets the status of "flag" for each bDeformGroup in ob->defbase
and returns an array containing them
+*/
+static char* gen_lck_flags(Object* ob)
+{
+ char is_locked = 0;
+ int i, k;
+ int defcnt = BLI_countlist(&ob->defbase);
+ char *flags = MEM_mallocN(defcnt*sizeof(char), "defflags");
+ bDeformGroup *defgroup = ob->defbase.first;
+ for(i = 0; i < defcnt && defgroup; i++) {
+ flags[i] = defgroup->flag;
+ defgroup = defgroup->next;
+ if(flags[i]) {
+ is_locked = 1;
+ }
+ }
+ if(is_locked){
+ return flags;
+ }
+ return NULL;
+}
+/*Jason was here
+this alters the weights in order to maintain the ratios to match with the
change in weights of pnt_dw
+*/
+static void fix_weight_ratios(Mesh *me, MDeformWeight *pnt_dw, float oldw)
+{
+ int i, k, totvert, cnt;
+ float scaledown = 1.0f;
+ float neww = pnt_dw->weight;
+ int defgroup = pnt_dw->def_nr;
+ totvert = me->totvert;
+ pnt_dw->weight = oldw;
+
+ if(oldw == 0 || neww == 0){
+ return;
+ }
+
+ for(i = 0; i < totvert; i++) {
+ cnt = (me->dvert+i)->totweight;
+ for(k = 0; k < cnt; k++) {
+ MDeformWeight *dw = ((me->dvert+i)->dw+k);
+ if(dw->def_nr == defgroup){
+ dw->weight = neww * (dw->weight / oldw);
+ if(dw->weight > scaledown){
+ scaledown = dw->weight;
+ }
+ break;
+ }
+ }
+ }
+ if(scaledown > 1.0f) {
+ for(i = 0; i < totvert; i++) {
+ cnt = (me->dvert+i)->totweight;
+ for(k = 0; k < cnt; k++) {
+ MDeformWeight *dw = ((me->dvert+i)->dw+k);
+ if(dw->def_nr == defgroup){
+ dw->weight /= scaledown;
+ break;
+ }
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36953] branches/soc-2011-onion/source/ blender: GSOC 2011 - onion branch
Revision: 36953
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36953
Author: psy-fi
Date: 2011-05-27 17:59:48 + (Fri, 27 May 2011)
Log Message:
---
GSOC 2011 - onion branch
--Color correction fix series no.3--
After brief discussion on irc and ML
reverting changes to byte path.
For now color correct behavior will be used only
for float textures and only for brush colors, not brush texture images.
also fixed loading for color corrected high-res float textures. Now results
when painting between the two should be consistent.
There's still a speed issue, this time with the image editor. I have an idea
about this though, coming in the next commit :).
brush texture images are considered to be in sRGB space,
however they are not yet converted to linear rgb due to precision
considerations.This will be further tested until a decision is made.
GLSL mode may also show incorrect results(tests needed);
Also, it looks like non-sRGB images are not color corrected before
drawn on the GUI (for example noise textures)
coming soon, optimization for byte texture painting path + user preference for
high res texture loading.
Modified Paths:
--
branches/soc-2011-onion/source/blender/blenkernel/intern/brush.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-onion/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-onion/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-onion/source/blender/imbuf/intern/divers.c
Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/brush.c
===
--- branches/soc-2011-onion/source/blender/blenkernel/intern/brush.c
2011-05-27 16:20:49 UTC (rev 36952)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/brush.c
2011-05-27 17:59:48 UTC (rev 36953)
@@ -571,9 +571,9 @@
}
}
else {
- crgb[0]= FTOCHAR(srgb_to_linearrgb(brush->rgb[0]));
- crgb[1]= FTOCHAR(srgb_to_linearrgb(brush->rgb[1]));
- crgb[2]= FTOCHAR(srgb_to_linearrgb(brush->rgb[2]));
+ crgb[0]= brush->rgb[0];
+ crgb[1]= brush->rgb[1];
+ crgb[2]= brush->rgb[2];
for (y=0; y < ibuf->y; y++) {
dst = (char*)ibuf->rect + y*rowbytes;
@@ -601,9 +601,9 @@
dist = sqrt(xy[0]*xy[0] + xy[1]*xy[1]);
brush_sample_tex(brush, xy, rgba, 0);
- dst[0] =
FTOCHAR(rgba[0]*srgb_to_linearrgb(brush->rgb[0]));
- dst[1] =
FTOCHAR(rgba[1]*srgb_to_linearrgb(brush->rgb[1]));
- dst[2] =
FTOCHAR(rgba[2]*srgb_to_linearrgb(brush->rgb[2]));
+ dst[0] = FTOCHAR(rgba[0]*brush->rgb[0]);
+ dst[1] = FTOCHAR(rgba[1]*brush->rgb[1]);
+ dst[2] = FTOCHAR(rgba[2]*brush->rgb[2]);
dst[3] =
FTOCHAR(rgba[3]*alpha*brush_curve_strength_clamp(brush, dist, radius));
} else {
dist = sqrt(xy[0]*xy[0] + xy[1]*xy[1]);
Modified:
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
===
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
2011-05-27 16:20:49 UTC (rev 36952)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
2011-05-27 17:59:48 UTC (rev 36953)
@@ -3674,9 +3674,9 @@
if (ps->is_texbrush) {
/*rgba already holds a texture result here from higher level
function*/
- rgba_ub[0] = FTOCHAR(rgba[0] *
srgb_to_linearrgb(ps->brush->rgb[0]));
- rgba_ub[1] = FTOCHAR(rgba[1] *
srgb_to_linearrgb(ps->brush->rgb[1]));
- rgba_ub[2] = FTOCHAR(rgba[2] *
srgb_to_linearrgb(ps->brush->rgb[2]));
+ rgba_ub[0] = FTOCHAR(rgba[0] * ps->brush->rgb[0]);
+ rgba_ub[1] = FTOCHAR(rgba[1] * ps->brush->rgb[1]);
+ rgba_ub[2] = FTOCHAR(rgba[2] * ps->brush->rgb[2]);
rgba_ub[3] = FTOCHAR(rgba[3]);
}
else {
Modified: branches/soc-2011-onion/source/blender/gpu/intern/gpu_draw.c
===
--- branches/soc-2011-onion/source/blender/gpu/intern/gpu_draw.c
2011-05-27 16:20:49 UTC (rev 36952)
+++ branches/soc-2011-onion/source/blender/gpu/intern/gpu_draw.c
2011-05-27 17:59:48 UTC (rev 36953)
@@ -409,12 +409,11 @@
int rectw, recth, tpx=0, tpy=0, y;
unsigned int *rectrow, *tilerectrow;
unsigned int *tilerect= NULL, *scalerect= NULL, *rect= NULL;
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36952] trunk/blender/source/gameengine/ BlenderRoutines/BL_KetsjiEmbedStart.cpp: Attempted fix for #27482: game engine running slow due to revision 3
Revision: 36952
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36952
Author: blendix
Date: 2011-05-27 16:20:49 + (Fri, 27 May 2011)
Log Message:
---
Attempted fix for #27482: game engine running slow due to revision 36698 which
fixed frame colors for letterbox drawing (happens when in camera view).
Cause is unclear, seems some sort of strange graphics driver thing on 32 bit.
Changes are a fix for the incorrect usage of glViewport, and avoiding the extra
clear if it's not needed.
Revision Links:
--
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36698
Modified Paths:
--
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
Modified:
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2011-05-27 13:08:09 UTC (rev 36951)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2011-05-27 16:20:49 UTC (rev 36952)
@@ -250,10 +250,12 @@
// some blender stuff
float camzoom;
+ int draw_letterbox = 0;
if(rv3d->persp==RV3D_CAMOB) {
if(startscene->gm.framing.type == SCE_GAMEFRAMING_BARS)
{ /* Letterbox */
camzoom = 1.0f;
+ draw_letterbox = 1;
}
else {
camzoom =
BKE_screen_view3d_zoom_to_fac(rv3d->camzoom);
@@ -428,12 +430,15 @@
// first check if we want to exit
exitrequested =
ketsjiengine->GetExitCode();
- // Clear screen to border color
- // We do this here since we set the
canvas to be within the frames. This means the engine
- // itself is unaware of the extra
space, so we clear the whole region for it.
- glClearColor(scene->gm.framing.col[0],
scene->gm.framing.col[1], scene->gm.framing.col[2], 1.0f);
- glViewport(ar->winrct.xmin,
ar->winrct.ymin, ar->winrct.xmax, ar->winrct.ymax);
- glClear(GL_COLOR_BUFFER_BIT);
+ if(draw_letterbox) {
+ // Clear screen to border color
+ // We do this here since we set
the canvas to be within the frames. This means the engine
+ // itself is unaware of the
extra space, so we clear the whole region for it.
+
glClearColor(scene->gm.framing.col[0], scene->gm.framing.col[1],
scene->gm.framing.col[2], 1.0f);
+ glViewport(ar->winrct.xmin,
ar->winrct.ymin,
+ ar->winrct.xmax -
ar->winrct.xmin, ar->winrct.ymax - ar->winrct.ymin);
+ glClear(GL_COLOR_BUFFER_BIT);
+ }
// kick the engine
bool render = ketsjiengine->NextFrame();
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36951] branches/soc-2010-jwilkins: Merged with Merged with trunk: 36905-36950
Revision: 36951 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36951 Author: jwilkins Date: 2011-05-27 13:08:09 + (Fri, 27 May 2011) Log Message: --- Merged with Merged with trunk: 36905-36950 Modified Paths: -- branches/soc-2010-jwilkins/build_files/cmake/cmake_netbeans_project.py branches/soc-2010-jwilkins/build_files/cmake/cmake_qtcreator_project.py branches/soc-2010-jwilkins/build_files/cmake/project_info.py branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py branches/soc-2010-jwilkins/build_files/scons/tools/btools.py branches/soc-2010-jwilkins/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py branches/soc-2010-jwilkins/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp branches/soc-2010-jwilkins/release/scripts/modules/bpy_extras/mesh_utils.py branches/soc-2010-jwilkins/release/scripts/modules/bpy_extras/view3d_utils.py branches/soc-2010-jwilkins/release/scripts/modules/bpy_types.py branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/mesh.py branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/uvcalc_follow_active.py branches/soc-2010-jwilkins/release/scripts/startup/bl_operators/wm.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/__init__.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_data_empty.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/properties_object_constraint.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_image.py branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_userpref.py branches/soc-2010-jwilkins/release/windows/installer/00.sconsblender.nsi branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/object.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/writeffmpeg.c branches/soc-2010-jwilkins/source/blender/blenlib/BLI_path_util.h branches/soc-2010-jwilkins/source/blender/blenlib/BLI_string.h branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_color.c branches/soc-2010-jwilkins/source/blender/blenlib/intern/path_util.c branches/soc-2010-jwilkins/source/blender/blenlib/intern/string.c branches/soc-2010-jwilkins/source/blender/blenloader/BLO_readfile.h branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c branches/soc-2010-jwilkins/source/blender/editors/animation/keyingsets.c branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature_sketch.c branches/soc-2010-jwilkins/source/blender/editors/armature/poselib.c branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_edit.c branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_paint.c branches/soc-2010-jwilkins/source/blender/editors/include/ED_keyframing.h branches/soc-2010-jwilkins/source/blender/editors/interface/interface.c branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_mods.c branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_tools.c branches/soc-2010-jwilkins/source/blender/editors/object/object_edit.c branches/soc-2010-jwilkins/source/blender/editors/object/object_hook.c branches/soc-2010-jwilkins/source/blender/editors/object/object_modifier.c branches/soc-2010-jwilkins/source/blender/editors/object/object_relations.c branches/soc-2010-jwilkins/source/blender/editors/object/object_vgroup.c branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_vertex.c branches/soc-2010-jwilkins/source/blender/editors/space_file/space_file.c branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_draw.c branches/soc-2010-jwilkins/source/blender/imbuf/intern/anim_movie.c branches/soc-2010-jwilkins/source/blender/imbuf/intern/util.c branches/soc-2010-jwilkins/source/blender/makesrna/RNA_access.h branches/soc-2010-jwilkins/source/blender/makesrna/RNA_define.h branches/soc-2010-jwilkins/source/blender/makesrna/RNA_enum_types.h branches/soc-2010-jwilkins/source/blender/makesrna/RNA_types.h branches/soc-2010-jwilkins/source/blender/makesrna/intern/makesrna.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_access.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_actuator.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_constraint.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_define.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_image.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_internal_types.h branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_material.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_nodetree.c branches/
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36950] branches/soc-2010-jwilkins/source/ gameengine/Ketsji/KXNetwork: Merge Cleanup.
Revision: 36950
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36950
Author: jwilkins
Date: 2011-05-27 12:42:11 + (Fri, 27 May 2011)
Log Message:
---
Merge Cleanup.
Third attempt to make sure branch is a copy of trunk revision 36905. A few
more fixes.
Revision Links:
--
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36905
Modified Paths:
--
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/SConscript
Modified:
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
===
---
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
2011-05-27 12:13:10 UTC (rev 36949)
+++
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
2011-05-27 12:42:11 UTC (rev 36950)
@@ -98,7 +98,7 @@
return replica;
}
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
/* */
/* Python interface --- */
@@ -139,4 +139,4 @@
{ NULL }//Sentinel
};
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
Modified:
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
===
---
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
2011-05-27 12:13:10 UTC (rev 36949)
+++
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
2011-05-27 12:42:11 UTC (rev 36950)
@@ -161,7 +161,7 @@
return m_IsUp;
}
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
/* - */
/* Python interface */
@@ -222,4 +222,4 @@
}
}
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
Modified:
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
===
---
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
2011-05-27 12:13:10 UTC (rev 36949)
+++
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
2011-05-27 12:42:11 UTC (rev 36950)
@@ -75,7 +75,7 @@
m_NetworkScene= val;
};
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
/* - */
/* Python interface */
@@ -85,7 +85,7 @@
static PyObject*pyattr_get_bodies(void* self_v, const
KX_PYATTRIBUTE_DEF *attrdef);
static PyObject*pyattr_get_subjects(void* self_v, const
KX_PYATTRIBUTE_DEF *attrdef);
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
};
Modified:
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/SConscript
===
--- branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/SConscript
2011-05-27 12:13:10 UTC (rev 36949)
+++ branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/SConscript
2011-05-27 12:42:11 UTC (rev 36950)
@@ -11,8 +11,7 @@
defs = []
if env['WITH_BF_PYTHON']:
- incs += ' ' + env['BF_PYTHON_INC']
-else:
- defs.append('DISABLE_PYTHON')
+incs += ' ' + env['BF_PYTHON_INC']
+defs.append('WITH_PYTHON')
env.BlenderLib ( 'bf_network', Split(sources), Split(incs),
defines=defs,libtype=['core','player'], priority=[400,125],
cxx_compileflags=env['BGE_CXXFLAGS'])
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36949] branches/cycles/intern/cycles: Cycles: fix GLEW library build issue.
Revision: 36949
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36949
Author: blendix
Date: 2011-05-27 12:13:10 + (Fri, 27 May 2011)
Log Message:
---
Cycles: fix GLEW library build issue.
Modified Paths:
--
branches/cycles/intern/cycles/app/CMakeLists.txt
branches/cycles/intern/cycles/blender/CMakeLists.txt
branches/cycles/intern/cycles/cmake/external_libs.cmake
Modified: branches/cycles/intern/cycles/app/CMakeLists.txt
===
--- branches/cycles/intern/cycles/app/CMakeLists.txt2011-05-27 11:02:36 UTC
(rev 36948)
+++ branches/cycles/intern/cycles/app/CMakeLists.txt2011-05-27 12:13:10 UTC
(rev 36949)
@@ -18,7 +18,7 @@
cycles_util
${Boost_LIBRARIES}
${OPENGL_LIBRARIES}
- ${GLEW_LIBRARY}
+ ${CYCLES_GLEW_LIBRARY}
${OPENIMAGEIO_LIBRARY})
IF(WITH_CYCLES_TEST)
Modified: branches/cycles/intern/cycles/blender/CMakeLists.txt
===
--- branches/cycles/intern/cycles/blender/CMakeLists.txt2011-05-27
11:02:36 UTC (rev 36948)
+++ branches/cycles/intern/cycles/blender/CMakeLists.txt2011-05-27
12:13:10 UTC (rev 36949)
@@ -43,7 +43,7 @@
${OPENGL_LIBRARIES}
${OPENIMAGEIO_LIBRARY}
${GLUT_LIBRARIES}
- ${GLEW_LIBRARIES}
+ ${CYCLES_GLEW_LIBRARY}
${BLENDER_LIBRARIES})
IF(WITH_CYCLES_OSL)
Modified: branches/cycles/intern/cycles/cmake/external_libs.cmake
===
--- branches/cycles/intern/cycles/cmake/external_libs.cmake 2011-05-27
11:02:36 UTC (rev 36948)
+++ branches/cycles/intern/cycles/cmake/external_libs.cmake 2011-05-27
12:13:10 UTC (rev 36949)
@@ -62,6 +62,12 @@
INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR})
ENDIF()
+IF(WITH_BUILTIN_GLEW)
+ SET(CYCLES_GLEW_LIBRARY extern_glew)
+ELSE()
+ SET(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY})
+ENDIF()
+
###
# OpenShadingLanguage
@@ -165,12 +171,12 @@
IF(WIN32)
SET(OPENCL_INCLUDES "")
- SET(OPENCL_LIRBARIES "OpenCL")
+ SET(OPENCL_LIBRARIES "OpenCL")
ENDIF()
IF(UNIX AND NOT APPLE)
SET(OPENCL_INCLUDES ${CYCLES_OPENCL})
- SET(OPENCL_LIRBARIES "OpenCL")
+ SET(OPENCL_LIBRARIES "OpenCL")
ENDIF()
ADD_DEFINITIONS(-DWITH_OPENCL)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36948] branches/soc-2010-jwilkins: Merge Cleanup.
Revision: 36948
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36948
Author: jwilkins
Date: 2011-05-27 11:02:36 + (Fri, 27 May 2011)
Log Message:
---
Merge Cleanup.
Second attempt to make sure branch is a copy of trunk revision 36905. Just
missed a few files.
Revision Links:
--
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36905
Modified Paths:
--
branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py
branches/soc-2010-jwilkins/extern/SConscript
branches/soc-2010-jwilkins/extern/glew/src/glew.c
branches/soc-2010-jwilkins/release/bin/blender-thumbnailer.py
branches/soc-2010-jwilkins/release/windows/installer/00.sconsblender.nsi
branches/soc-2010-jwilkins/source/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_brush.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_paint.h
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/colortools.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/icons.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/material.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/paint.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/pbvh.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_material.c
branches/soc-2010-jwilkins/source/blender/ikplugin/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_texture.c
branches/soc-2010-jwilkins/source/blender/modifiers/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/modifiers/SConscript
Removed Paths:
-
branches/soc-2010-jwilkins/extern/make/
branches/soc-2010-jwilkins/intern/audaspace/make/
branches/soc-2010-jwilkins/release/scripts/modules/rigify_utils.py
branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_bfile.c
branches/soc-2010-jwilkins/source/blender/editors/space_console/console_report.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/writeimage.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/anim.c
branches/soc-2010-jwilkins/source/tests/
Modified: branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py
===
--- branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py
2011-05-27 09:57:53 UTC (rev 36947)
+++ branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py
2011-05-27 11:02:36 UTC (rev 36948)
@@ -60,206 +60,206 @@
vcp = []
def getresources():
- return resources
+return resources
def init_lib_dict():
- for pt in possible_types:
- libs[pt] = {}
+for pt in possible_types:
+libs[pt] = {}
# helper func for add_lib_to_dict
def internal_lib_to_dict(dict = None, libtype = None, libname = None, priority
= 100):
- if not libname in dict[libtype]:
- done = None
- while not done:
- if dict[libtype].has_key(priority):
- priority = priority + 1
- else:
- done = True
- dict[libtype][priority] = libname
+if not libname in dict[libtype]:
+done = None
+while not done:
+if dict[libtype].has_key(priority):
+priority = priority + 1
+else:
+done = True
+dict[libtype][priority] = libname
# libtype and priority can both be lists, for defining lib in multiple places
def add_lib_to_dict(env, dict = None, libtype = None, libname = None, priority
= 100):
- if not dict or not libtype or not libname:
- print "Passed wrong arg"
- env.Exit()
+if not dict or not libtype or not libname:
+print "Passed wrong arg"
+env.Exit()
- if type(libtype) is str and type(priority) i
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36947] trunk/blender: Windows installer and Path changes, fixing various issues:
Revision: 36947
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36947
Author: blendix
Date: 2011-05-27 09:57:53 + (Fri, 27 May 2011)
Log Message:
---
Windows installer and Path changes, fixing various issues:
* Windows installer not working for non-admin users and multiple users
* Addon scripts not installing next to user configuration
* Portable install not being taken into account in all places
The main problem was the windows installer was installing system scripts in
AppData next to the user configuration directory, which is not shared between
users. Now these are installed in ProgramFiles, and only addon scripts added
by the users go to AppData.
On all platforms, addon scripts were sometimes getting installed between
system scripts, because the scripts folder in the executable directory was
given precedence over the user configuration folder, that is no longer done
now. So addons now behave like user configuration, they are preserved even
if you download a newer build of the same blender version.
If you have an installation of 2.57 on windows, the addon install location
will not change until we do the version bump to 2.58, to avoid conflicts with
the existing the installed 2.57 version.
The old behavior of giving precedence to the local folder was done to support
portable install, where all configuration is written to the local folder. This
is now implemented differently: if and only if a "config" folder exists in the
local folder, portable install will be assumed, and files will only be written
to that local folder.
Modified Paths:
--
trunk/blender/build_files/scons/tools/btools.py
trunk/blender/release/scripts/startup/bl_operators/wm.py
trunk/blender/release/windows/installer/00.sconsblender.nsi
trunk/blender/source/blender/blenlib/BLI_path_util.h
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/editors/space_file/space_file.c
trunk/blender/source/blender/python/intern/bpy.c
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: trunk/blender/build_files/scons/tools/btools.py
===
--- trunk/blender/build_files/scons/tools/btools.py 2011-05-27 09:38:49 UTC
(rev 36946)
+++ trunk/blender/build_files/scons/tools/btools.py 2011-05-27 09:57:53 UTC
(rev 36947)
@@ -615,10 +615,7 @@
else:
if len(df)>0:
dp_tmp = dp[l:]
-if dp_tmp.find('python\\lib') > -1:
-datafiles += "\n" +r'SetOutPath $INSTDIR'+dp[l:]+"\n\n"
-else:
-datafiles += "\n"+r'SetOutPath $BLENDERHOME'+dp[l:]+"\n\n"
+datafiles += "\n" +r'SetOutPath $INSTDIR'+dp[l:]+"\n\n"
for f in df:
outfile = os.path.join(dp,f)
Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===
--- trunk/blender/release/scripts/startup/bl_operators/wm.py2011-05-27
09:38:49 UTC (rev 36946)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py2011-05-27
09:57:53 UTC (rev 36947)
@@ -940,6 +940,14 @@
self.report({'ERROR'}, "Source path %r exists" % path_src)
else:
shutil.copytree(path_src, path_dst)
+
+# in 2.57 and earlier windows installers, system scripts were
copied
+# into the configuration directory, don't want to copy those
+system_script = os.path.join(path_dst,
'scripts/modules/bpy_types.py')
+if os.path.isfile(system_script):
+shutil.rmtree(os.path.join(path_dst, 'scripts'))
+shutil.rmtree(os.path.join(path_dst, 'plugins'))
+
# dont loose users work if they open the splash later.
if bpy.data.is_saved is bpy.data.is_dirty is False:
bpy.ops.wm.read_homefile()
Modified: trunk/blender/release/windows/installer/00.sconsblender.nsi
===
--- trunk/blender/release/windows/installer/00.sconsblender.nsi 2011-05-27
09:38:49 UTC (rev 36946)
+++ trunk/blender/release/windows/installer/00.sconsblender.nsi 2011-05-27
09:57:53 UTC (rev 36947)
@@ -33,11 +33,11 @@
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
-Page custom DataLocation DataLocationOnLeave
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_WELCOME
+UninstPage custom un.OptionalRemoveConfig un.OptionalRemoveConfigOnLeave
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
!insertmacro MUI_UNPAGE_FINISH
@@ -62,7 +62,6 @@
LangString DESC_StartMenu ${LANG_ENGLISH} "
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36946] branches/cycles/intern/cycles/ kernel/svm/svm_types.h: Cycles: some mix node blend modes not working correct:
Revision: 36946 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36946 Author: blendix Date: 2011-05-27 09:38:49 + (Fri, 27 May 2011) Log Message: --- Cycles: some mix node blend modes not working correct: subtract, screen, divide, difference, darken, lighten, overlay patch by Sanne, thanks! Modified Paths: -- branches/cycles/intern/cycles/kernel/svm/svm_types.h Modified: branches/cycles/intern/cycles/kernel/svm/svm_types.h === --- branches/cycles/intern/cycles/kernel/svm/svm_types.h2011-05-27 08:45:48 UTC (rev 36945) +++ branches/cycles/intern/cycles/kernel/svm/svm_types.h2011-05-27 09:38:49 UTC (rev 36946) @@ -119,13 +119,13 @@ NODE_MIX_BLEND = 0, NODE_MIX_ADD, NODE_MIX_MUL, + NODE_MIX_SUB, NODE_MIX_SCREEN, - NODE_MIX_OVERLAY, - NODE_MIX_SUB, NODE_MIX_DIV, NODE_MIX_DIFF, NODE_MIX_DARK, NODE_MIX_LIGHT, + NODE_MIX_OVERLAY, NODE_MIX_DODGE, NODE_MIX_BURN, NODE_MIX_HUE, ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36945] branches/soc-2011-pepper/source/ gameengine: Moving BL_Action and BL_ActionManager to Ketsji to avoid linking issues with gcc
Revision: 36945
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36945
Author: moguri
Date: 2011-05-27 08:45:48 + (Fri, 27 May 2011)
Log Message:
---
Moving BL_Action and BL_ActionManager to Ketsji to avoid linking issues with gcc
Modified Paths:
--
branches/soc-2011-pepper/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-pepper/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-pepper/source/gameengine/Ketsji/SConscript
Added Paths:
---
branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Action.h
branches/soc-2011-pepper/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/soc-2011-pepper/source/gameengine/Ketsji/BL_ActionManager.h
Removed Paths:
-
branches/soc-2011-pepper/source/gameengine/Converter/BL_Action.cpp
branches/soc-2011-pepper/source/gameengine/Converter/BL_Action.h
branches/soc-2011-pepper/source/gameengine/Converter/BL_ActionManager.cpp
branches/soc-2011-pepper/source/gameengine/Converter/BL_ActionManager.h
Deleted: branches/soc-2011-pepper/source/gameengine/Converter/BL_Action.cpp
===
--- branches/soc-2011-pepper/source/gameengine/Converter/BL_Action.cpp
2011-05-27 07:47:42 UTC (rev 36944)
+++ branches/soc-2011-pepper/source/gameengine/Converter/BL_Action.cpp
2011-05-27 08:45:48 UTC (rev 36945)
@@ -1,198 +0,0 @@
-/**
- * $Id$
- *
- * * BEGIN GPL LICENSE BLOCK *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * * END GPL LICENSE BLOCK *
- */
-
-#include "BL_Action.h"
-#include "BL_ArmatureObject.h"
-#include "KX_GameObject.h"
-
-// These three are for getting the action from the logic manager
-#include "KX_Scene.h"
-#include "KX_PythonInit.h"
-#include "SCA_LogicManager.h"
-
-extern "C" {
-#include "BKE_animsys.h"
-#include "BKE_action.h"
-#include "RNA_access.h"
-#include "RNA_define.h"
-}
-
-BL_Action::BL_Action(class KX_GameObject* gameobj,
- const char* name,
- float start,
- float end,
- float blendin,
- short play_mode,
- short blend_mode)
-:
- m_obj(gameobj),
- m_startframe(start),
- m_endframe(end),
- m_blendin(blendin),
- m_playmode(play_mode),
- m_endtime(0.f),
- m_localtime(start),
- m_blendframe(0.f),
- m_blendstart(0.f),
- m_pose(NULL),
- m_blendpose(NULL),
- m_done(false)
-{
- m_starttime = KX_GetActiveEngine()->GetFrameTime();
- m_action =
(bAction*)KX_GetActiveScene()->GetLogicManager()->GetActionByName(name);
-
- if (!m_action) printf("Failed to load action: %s\n", name);
-}
-
-BL_Action::~BL_Action()
-{
- if (m_pose)
- game_free_pose(m_pose);
- if (m_blendpose)
- game_free_pose(m_blendpose);
-}
-
-void BL_Action::SetLocalTime(float curtime)
-{
- float dt = (curtime-m_starttime)*KX_KetsjiEngine::GetAnimFrameRate();
-
- if (m_endframe < m_startframe)
- dt = -dt;
-
- m_localtime = m_startframe + dt;
-}
-
-void BL_Action::Update(float curtime)
-{
- curtime -= KX_KetsjiEngine::GetSuspendedDelta();
-
- SetLocalTime(curtime);
-
- // Handle wrap around
- if (m_localtime < m_startframe || m_localtime > m_endframe)
- {
- switch(m_playmode)
- {
- case ACT_MODE_PLAY:
- // Clamp
- m_localtime = m_endframe;
- m_done = true;
- break;
- case ACT_MODE_LOOP:
- // Put the time back to the beginning
- m_localtime = m_startframe;
- m_starttime = curtime;
- break;
- case ACT_MODE_PING_
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36944] trunk/blender/source: == FFMPEG ==
Revision: 36944
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36944
Author: schlaile
Date: 2011-05-27 07:47:42 + (Fri, 27 May 2011)
Log Message:
---
== FFMPEG ==
Fixed and added additional ffmpeg cruft checking. Oh dear.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
2011-05-27 07:24:38 UTC (rev 36943)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
2011-05-27 07:47:42 UTC (rev 36944)
@@ -61,14 +61,18 @@
#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
-#if (LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 105)
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) &&
(LIBAVFORMAT_VERSION_MINOR >= 105))
#define FFMPEG_HAVE_AVIO 1
#endif
-#if (LIBAVFORMAT_VERSION_MAJOR >= 53) && (LIBAVFORMAT_VERSION_MINOR >= 3)
+#if (LIBAVFORMAT_VERSION_MAJOR > 53) || ((LIBAVFORMAT_VERSION_MAJOR >= 53) &&
(LIBAVFORMAT_VERSION_MINOR >= 1))
#define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
#endif
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) &&
(LIBAVFORMAT_VERSION_MINOR >= 101))
+#define FFMPEG_HAVE_AV_DUMP_FORMAT 1
+#endif
+
#ifndef FFMPEG_HAVE_AVIO
#define AVIO_FLAG_WRITE URL_WRONLY
#define avio_open url_fopen
@@ -82,6 +86,10 @@
#define AVIO_FLAG_WRITE URL_WRONLY
#endif
+#ifndef FFMPEG_HAVE_AV_DUMP_FORMAT
+#define av_dump_format dump_format
+#endif
+
extern void do_init_ffmpeg(void);
static int ffmpeg_type = 0;
Modified: trunk/blender/source/blender/imbuf/intern/anim_movie.c
===
--- trunk/blender/source/blender/imbuf/intern/anim_movie.c 2011-05-27
07:24:38 UTC (rev 36943)
+++ trunk/blender/source/blender/imbuf/intern/anim_movie.c 2011-05-27
07:47:42 UTC (rev 36944)
@@ -108,6 +108,14 @@
#define FFMPEG_SWSCALE_COLOR_SPACE_SUPPORT
#endif
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) &&
(LIBAVFORMAT_VERSION_MINOR >= 101))
+#define FFMPEG_HAVE_AV_DUMP_FORMAT 1
+#endif
+
+#ifndef FFMPEG_HAVE_AV_DUMP_FORMAT
+#define av_dump_format dump_format
+#endif
+
#endif //WITH_FFMPEG
#ifdef WITH_REDCODE
Modified: trunk/blender/source/blender/imbuf/intern/util.c
===
--- trunk/blender/source/blender/imbuf/intern/util.c2011-05-27 07:24:38 UTC
(rev 36943)
+++ trunk/blender/source/blender/imbuf/intern/util.c2011-05-27 07:47:42 UTC
(rev 36944)
@@ -62,8 +62,17 @@
#include
#include
#include
+
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) &&
(LIBAVFORMAT_VERSION_MINOR >= 101))
+#define FFMPEG_HAVE_AV_DUMP_FORMAT 1
#endif
+#ifndef FFMPEG_HAVE_AV_DUMP_FORMAT
+#define av_dump_format dump_format
+#endif
+
+#endif
+
#define UTIL_DEBUG 0
const char *imb_ext_image[] = {
Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
===
--- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h 2011-05-27
07:24:38 UTC (rev 36943)
+++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h 2011-05-27
07:47:42 UTC (rev 36944)
@@ -34,7 +34,9 @@
#include
#include
#include
+#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) &&
(LIBAVFORMAT_VERSION_MINOR >= 101))
#include
+#endif
#include
#include "DNA_listBase.h"
#include "BLI_threads.h"
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
