[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43324] trunk/blender: Some small fixes to get things compiling on solaris with cmake.
Revision: 43324
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=43324
Author: sirdude
Date: 2012-01-12 16:31:27 + (Thu, 12 Jan 2012)
Log Message:
---
Some small fixes to get things compiling on solaris with cmake.
There are also some changes that need to be done to libmv but I'm
leaving those out so I can get it patched upstream first.
(Only works with gcc/g++ if we want to use sun's compiler we would need
to get rid of all of our annonymous structs which I don't think
we want to do at this point, example:
typedef struct wmNDOFMotionData {
union {
float tvec[3]; // translation
struct { float tx, ty, tz; }; // this would need to be fixed
// something like this or something similar:
struct { float x, y, z; } t;
};
...
)
Kent
Modified Paths:
--
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/blenlib/BLI_fnmatch.h
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: trunk/blender/CMakeLists.txt
===
--- trunk/blender/CMakeLists.txt2012-01-12 15:56:08 UTC (rev 43323)
+++ trunk/blender/CMakeLists.txt2012-01-12 16:31:27 UTC (rev 43324)
@@ -620,6 +620,10 @@
# CLang is the same as GCC for now.
elseif(CMAKE_CXX_COMPILER_ID MATCHES Clang)
set(PLATFORM_CFLAGS -pipe -fPIC -funsigned-char
-fno-strict-aliasing)
+ # Solaris CC
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES SunPro)
+ set(PLATFORM_CFLAGS -pipe -features=extensions -fPIC
-D__FUNCTION__=__func__)
+
# Intel C++ Compiler
elseif(CMAKE_C_COMPILER_ID MATCHES Intel)
# think these next two are broken
Modified: trunk/blender/source/blender/blenlib/BLI_fnmatch.h
===
--- trunk/blender/source/blender/blenlib/BLI_fnmatch.h 2012-01-12 15:56:08 UTC
(rev 43323)
+++ trunk/blender/source/blender/blenlib/BLI_fnmatch.h 2012-01-12 16:31:27 UTC
(rev 43324)
@@ -51,7 +51,7 @@
#defineFNM_NOESCAPE(1 1) /* Backslashes don't quote special
chars. */
#defineFNM_PERIOD (1 2) /* Leading `.' is matched only
explicitly. */
-#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE 2 || defined (_GNU_SOURCE)
+#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE 2 || defined (_GNU_SOURCE)
|| defined( __SUNPRO_C)
#defineFNM_FILE_NAME FNM_PATHNAME /* Preferred GNU name. */
#defineFNM_LEADING_DIR (1 3) /* Ignore `/...' after a match. */
#defineFNM_CASEFOLD(1 4) /* Compare without regard to case. */
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2012-01-12
15:56:08 UTC (rev 43323)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2012-01-12
16:31:27 UTC (rev 43324)
@@ -52,7 +52,7 @@
#include GHOST_Path-api.h
-#if defined WIN32 !defined _LIBC
+#if defined WIN32 !defined _LIBC || defined __sun
# include BLI_fnmatch.h /* use fnmatch included in blenlib */
#else
# ifndef _GNU_SOURCE
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
===
--- trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
2012-01-12 15:56:08 UTC (rev 43323)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
2012-01-12 16:31:27 UTC (rev 43324)
@@ -57,7 +57,7 @@
#include BLI_utildefines.h
#include BLI_math_base.h
-#if defined WIN32 !defined _LIBC
+#if defined WIN32 !defined _LIBC || defined __sun
# include BLI_fnmatch.h /* use fnmatch included in blenlib */
#else
# ifndef _GNU_SOURCE
Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===
--- trunk/blender/source/blender/makesrna/RNA_access.h 2012-01-12 15:56:08 UTC
(rev 43323)
+++ trunk/blender/source/blender/makesrna/RNA_access.h 2012-01-12 16:31:27 UTC
(rev 43324)
@@ -996,7 +996,9 @@
/* macro which inserts the function name */
-#ifdef __GNUC__
+/*
+*/
+#if defined __GNUC__ || defined __sun
# define RNA_warning(format, args...) _RNA_warning(%s: format \n,
__func__, ##args)
#else
# define RNA_warning(format, ...) _RNA_warning(%s: format \n,
__FUNCTION__, __VA_ARGS__)
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp2012-01-12
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43326] trunk/blender/source/blender/ makesrna/RNA_access.h: Remove empty comment I added on accident.
Revision: 43326 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=43326 Author: sirdude Date: 2012-01-12 17:05:13 + (Thu, 12 Jan 2012) Log Message: --- Remove empty comment I added on accident. Kent Modified Paths: -- trunk/blender/source/blender/makesrna/RNA_access.h Modified: trunk/blender/source/blender/makesrna/RNA_access.h === --- trunk/blender/source/blender/makesrna/RNA_access.h 2012-01-12 17:04:09 UTC (rev 43325) +++ trunk/blender/source/blender/makesrna/RNA_access.h 2012-01-12 17:05:13 UTC (rev 43326) @@ -996,8 +996,6 @@ /* macro which inserts the function name */ -/* -*/ #if defined __GNUC__ || defined __sun # define RNA_warning(format, args...) _RNA_warning(%s: format \n, __func__, ##args) #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 [39082] trunk/blender/build_files/scons/ config/darwin-config.py: Messed up char was causing problems on windows even though it was in the
Revision: 39082 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=39082 Author: sirdude Date: 2011-08-05 19:55:36 + (Fri, 05 Aug 2011) Log Message: --- Messed up char was causing problems on windows even though it was in the comments. Kent Modified Paths: -- trunk/blender/build_files/scons/config/darwin-config.py Modified: trunk/blender/build_files/scons/config/darwin-config.py === --- trunk/blender/build_files/scons/config/darwin-config.py 2011-08-05 19:08:52 UTC (rev 39081) +++ trunk/blender/build_files/scons/config/darwin-config.py 2011-08-05 19:55:36 UTC (rev 39082) @@ -60,7 +60,7 @@ CC = 'gcc-4.0' CXX = 'g++-4.0' elif MAC_CUR_VER = '10.6': - # OSX 10.6 and 10.7 developer tools don´t come with sdk 10.6 anymore ! + # OSX 10.6 and 10.7 developer tools do not come with sdk 10.6 anymore ! MAC_MIN_VERS = '10.6' MACOSX_DEPLOYMENT_TARGET = '10.6' MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk' ___ 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 [38995] trunk/blender/release/scripts/ startup/bl_ui/space_userpref_keymap.py: Add . py extension if it is missing from keymap file.
Revision: 38995
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=38995
Author: sirdude
Date: 2011-08-03 17:58:06 + (Wed, 03 Aug 2011)
Log Message:
---
Add .py extension if it is missing from keymap file.
This is for bug #28141
While not really a bug, it makes it a lot easyer to use if it
has the exension. (Isn't hidden from the user when they try to load it...)
Kent
Modified Paths:
--
trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
===
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
2011-08-03 17:45:09 UTC (rev 38994)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
2011-08-03 17:58:06 UTC (rev 38995)
@@ -592,6 +592,9 @@
if not self.filepath:
raise Exception(Filepath not set)
+if not self.filepath.endswith('.py'):
+self.filepath += '.py'
+
f = open(self.filepath, w)
if not f:
raise Exception(Could not open file)
___
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 [38940] trunk/blender/release/scripts/ modules/bpy/path.py: Fixed a few small typos.
Revision: 38940 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=38940 Author: sirdude Date: 2011-08-02 17:00:44 + (Tue, 02 Aug 2011) Log Message: --- Fixed a few small typos. Kent Modified Paths: -- trunk/blender/release/scripts/modules/bpy/path.py Modified: trunk/blender/release/scripts/modules/bpy/path.py === --- trunk/blender/release/scripts/modules/bpy/path.py 2011-08-02 16:51:50 UTC (rev 38939) +++ trunk/blender/release/scripts/modules/bpy/path.py 2011-08-02 17:00:44 UTC (rev 38940) @@ -136,7 +136,7 @@ def display_name_from_filepath(name): -Returns the path stripped of directort and extension, +Returns the path stripped of directory and extension, ensured to be utf8 compatible. name = _os.path.splitext(basename(name))[0] @@ -204,7 +204,7 @@ def ensure_ext(filepath, ext, case_sensitive=False): -Return the path with the extension added its its not alredy set. +Return the path with the extension added if it is not already set. :arg ext: The extension to check for. :type ext: string ___ 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 [38945] trunk/blender/CMakeLists.txt: Fixes an issue with OSX Lion
Revision: 38945
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=38945
Author: sirdude
Date: 2011-08-02 17:35:07 + (Tue, 02 Aug 2011)
Log Message:
---
Fixes an issue with OSX Lion
Also cleaned up the python detection for OSX
Kent
Modified Paths:
--
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===
--- trunk/blender/CMakeLists.txt2011-08-02 17:32:19 UTC (rev 38944)
+++ trunk/blender/CMakeLists.txt2011-08-02 17:35:07 UTC (rev 38945)
@@ -910,29 +910,16 @@
endif()
if(WITH_PYTHON)
- set(PYTHON_VERSION 3.2)
- if(PYTHON_VERSION MATCHES 3.2)
- # we use precompiled libraries for py 3.2 and up by
default
+ # we use precompiled libraries for py 3.2 and up by default
- # normally cached but not since we include them with
blender
- set(PYTHON_INCLUDE_DIR
${LIBDIR}/python/include/python${PYTHON_VERSION})
- # set(PYTHON_BINARY
${LIBDIR}/python/bin/python${PYTHON_VERSION}) # not used yet
- set(PYTHON_LIBRARY python${PYTHON_VERSION})
- set(PYTHON_LIBPATH
${LIBDIR}/python/lib/python${PYTHON_VERSION})
- # set(PYTHON_LINKFLAGS -u _PyMac_Error) # won't
build with this enabled
- else()
- # otherwise, use custom system framework
- # *not used but maintained incase some dev wants to*
+ # normally cached but not since we include them with blender
+set(PYTHON_VERSION 3.2)
+ set(PYTHON_INCLUDE_DIR
${LIBDIR}/python/include/python${PYTHON_VERSION})
+ # set(PYTHON_BINARY
${LIBDIR}/python/bin/python${PYTHON_VERSION}) # not used yet
+ set(PYTHON_LIBRARY python${PYTHON_VERSION})
+ set(PYTHON_LIBPATH
${LIBDIR}/python/lib/python${PYTHON_VERSION})
+ # set(PYTHON_LINKFLAGS -u _PyMac_Error) # won't build with
this enabled
- set(PYTHON
/System/Library/Frameworks/Python.framework/Versions/ CACHE PATH)
- set(PYTHON_INCLUDE_DIR
${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION} CACHE PATH)
- # set(PYTHON_BINARY
${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
- set(PYTHON_LIBRARY CACHE FILEPATH)
- set(PYTHON_LIBPATH
${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE PATH)
- set(PYTHON_LINKFLAGS -u _PyMac_Error -framework System
-framework Python CACHE STRING)
- unset(PYTHON)
- endif()
-
# uncached vars
set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
set(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
@@ -986,7 +973,17 @@
set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
endif()
- set(PLATFORM_LINKLIBS stdc++ SystemStubs)
+ find_library(SYSTEMSTUBS_LIBRARY
+ NAMES
+ SystemStubs
+ PATHS
+ )
+ mark_as_advanced(SYSTEMSTUBS_LIBRARY)
+ if(SYSTEMSTUBS_LIBRARY)
+ set(PLATFORM_LINKLIBS stdc++ SystemStubs)
+ else()
+ set(PLATFORM_LINKLIBS stdc++)
+ endif()
if(WITH_COCOA)
set(PLATFORM_CFLAGS -pipe -funsigned-char -DGHOST_COCOA)
___
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 [33572] trunk/blender/source/blender/ editors: A little more work on patch [#24814] Operators which have no decription
Revision: 33572
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=33572
Author: sirdude
Date: 2010-12-09 17:50:32 +0100 (Thu, 09 Dec 2010)
Log Message:
---
A little more work on patch [#24814] Operators which have no decription
submitted by Murat Egretli
Not actually a patch but talks about descriptions that are missing
and some small fixes that are needed.
Kent
Modified Paths:
--
trunk/blender/source/blender/editors/object/object_shapekey.c
trunk/blender/source/blender/editors/space_graph/graph_buttons.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_node/node_state.c
Modified: trunk/blender/source/blender/editors/object/object_shapekey.c
===
--- trunk/blender/source/blender/editors/object/object_shapekey.c
2010-12-09 16:15:51 UTC (rev 33571)
+++ trunk/blender/source/blender/editors/object/object_shapekey.c
2010-12-09 16:50:32 UTC (rev 33572)
@@ -253,8 +253,8 @@
{
/* identifiers */
ot-name= Add Shape Key;
- ot-name= Add shape key to the object.;
ot-idname= OBJECT_OT_shape_key_add;
+ ot-description= Add shape key to the object;
/* api callbacks */
ot-poll= shape_key_mode_poll;
@@ -281,8 +281,8 @@
{
/* identifiers */
ot-name= Remove Shape Key;
- ot-name= Remove shape key from the object.;
ot-idname= OBJECT_OT_shape_key_remove;
+ ot-description= Remove shape key from the object;
/* api callbacks */
ot-poll= shape_key_mode_poll;
Modified: trunk/blender/source/blender/editors/space_graph/graph_buttons.c
===
--- trunk/blender/source/blender/editors/space_graph/graph_buttons.c
2010-12-09 16:15:51 UTC (rev 33571)
+++ trunk/blender/source/blender/editors/space_graph/graph_buttons.c
2010-12-09 16:50:32 UTC (rev 33572)
@@ -746,6 +746,7 @@
{
ot-name= Properties;
ot-idname= GRAPH_OT_properties;
+ ot-description= Toggle display properties panel;
ot-exec= graph_properties;
ot-poll= ED_operator_ipo_active; // xxx
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===
--- trunk/blender/source/blender/editors/space_image/image_buttons.c
2010-12-09 16:15:51 UTC (rev 33571)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c
2010-12-09 16:50:32 UTC (rev 33572)
@@ -1019,6 +1019,7 @@
{
ot-name= Properties;
ot-idname= IMAGE_OT_properties;
+ ot-description= Toggle display properties panel;
ot-exec= image_properties;
ot-poll= ED_operator_image_active;
@@ -1042,6 +1043,7 @@
{
ot-name= Scopes;
ot-idname= IMAGE_OT_scopes;
+ ot-description= Toggle display scopes panel;
ot-exec= image_scopes;
ot-poll= ED_operator_image_active;
Modified: trunk/blender/source/blender/editors/space_node/node_state.c
===
--- trunk/blender/source/blender/editors/space_node/node_state.c
2010-12-09 16:15:51 UTC (rev 33571)
+++ trunk/blender/source/blender/editors/space_node/node_state.c
2010-12-09 16:50:32 UTC (rev 33572)
@@ -295,6 +295,7 @@
/* identifiers */
ot-name= View All;
ot-idname= NODE_OT_view_all;
+ ot-description= Resize view so you can see all nodes;
/* api callbacks */
ot-exec= node_view_all_exec;
___
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 [31383] trunk/blender/source/blender/ python/intern/Makefile: Added missing include for audio stuff.
Revision: 31383 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=31383 Author: sirdude Date: 2010-08-16 17:54:58 +0200 (Mon, 16 Aug 2010) Log Message: --- Added missing include for audio stuff. Still not linking with Makefiles, will try and fix later. Kent Modified Paths: -- trunk/blender/source/blender/python/intern/Makefile Modified: trunk/blender/source/blender/python/intern/Makefile === --- trunk/blender/source/blender/python/intern/Makefile 2010-08-16 15:42:29 UTC (rev 31382) +++ trunk/blender/source/blender/python/intern/Makefile 2010-08-16 15:54:58 UTC (rev 31383) @@ -57,6 +57,7 @@ CPPFLAGS += -I../../blenloader CPPFLAGS += -I../../windowmanager CPPFLAGS += -I../../render/extern/include +CPPFLAGS += -I$(NAN_AUDASPACE)/include # path to the guarded memory allocator CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include ___ 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 [26197] trunk/blender/source/Makefile: Change order of linking slightly so things link.
Revision: 26197 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=26197 Author: sirdude Date: 2010-01-22 17:28:16 +0100 (Fri, 22 Jan 2010) Log Message: --- Change order of linking slightly so things link. Kent Modified Paths: -- trunk/blender/source/Makefile Modified: trunk/blender/source/Makefile === --- trunk/blender/source/Makefile 2010-01-22 16:17:24 UTC (rev 26196) +++ trunk/blender/source/Makefile 2010-01-22 16:28:16 UTC (rev 26197) @@ -96,7 +96,6 @@ COMLIB += $(OCGDIR)/blender/nodes_tex/$(DEBUG_DIR)libnodes_tex.a COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a -COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a COMLIB += $(OCGDIR)/blender/ikplugin/$(DEBUG_DIR)libikplugin.a COMLIB += $(NAN_IKSOLVER)/lib/$(DEBUG_DIR)libiksolver.a COMLIB += $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc.a @@ -184,7 +183,9 @@ COMLIB += $(NAN_PNG)/lib/libpng.a COMLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a # This was a PULIB up to circa r25248 COMLIB += $(OCGDIR)/blender/gen_python/$(DEBUG_DIR)libgen_python.a +COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a + ifeq ($(WITH_QUICKTIME), true) COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a 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 [26113] trunk/blender/source/blender/ editors/space_logic/Makefile: added a missing include.
Revision: 26113 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=26113 Author: sirdude Date: 2010-01-19 19:09:14 +0100 (Tue, 19 Jan 2010) Log Message: --- added a missing include. Kent Modified Paths: -- trunk/blender/source/blender/editors/space_logic/Makefile Modified: trunk/blender/source/blender/editors/space_logic/Makefile === --- trunk/blender/source/blender/editors/space_logic/Makefile 2010-01-19 16:38:48 UTC (rev 26112) +++ trunk/blender/source/blender/editors/space_logic/Makefile 2010-01-19 18:09:14 UTC (rev 26113) @@ -48,6 +48,7 @@ CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../python CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +CPPFLAGS += -I../interface # own include ___ 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 [25625] trunk/blender: Fix for poor negliected Makefiles.
Revision: 25625
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=25625
Author: sirdude
Date: 2009-12-30 17:18:06 +0100 (Wed, 30 Dec 2009)
Log Message:
---
Fix for poor negliected Makefiles.
Kent
Modified Paths:
--
trunk/blender/intern/opennl/superlu/get_perm_c.c
trunk/blender/intern/opennl/superlu/sgstrf.c
trunk/blender/source/Makefile
trunk/blender/source/blender/editors/object/Makefile
trunk/blender/source/nan_link.mk
Modified: trunk/blender/intern/opennl/superlu/get_perm_c.c
===
--- trunk/blender/intern/opennl/superlu/get_perm_c.c2009-12-30 15:58:59 UTC
(rev 25624)
+++ trunk/blender/intern/opennl/superlu/get_perm_c.c2009-12-30 16:18:06 UTC
(rev 25625)
@@ -439,8 +439,6 @@
/* Transform perm_c into 0-based indexing. */
for (i = 0; i n; ++i) --perm_c[i];
- SUPERLU_FREE(b_colptr);
- SUPERLU_FREE(b_rowind);
SUPERLU_FREE(invp);
SUPERLU_FREE(dhead);
SUPERLU_FREE(qsize);
@@ -453,5 +451,6 @@
} else { /* Empty adjacency structure */
for (i = 0; i n; ++i) perm_c[i] = i;
}
-
+SUPERLU_FREE(b_colptr);
+SUPERLU_FREE(b_rowind);
}
Modified: trunk/blender/intern/opennl/superlu/sgstrf.c
===
--- trunk/blender/intern/opennl/superlu/sgstrf.c2009-12-30 15:58:59 UTC
(rev 25624)
+++ trunk/blender/intern/opennl/superlu/sgstrf.c2009-12-30 16:18:06 UTC
(rev 25625)
@@ -231,7 +231,10 @@
/* Allocate storage common to the factor routines */
*info = sLUMemInit(fact, work, lwork, m, n, Astore-nnz,
panel_size, L, U, Glu, iwork, swork);
-if ( *info ) return;
+if ( *info ) {
+ if ( *iwork) SUPERLU_FREE (iwork);
+ return;
+}
xsup= Glu.xsup;
supno = Glu.supno;
Modified: trunk/blender/source/Makefile
===
--- trunk/blender/source/Makefile 2009-12-30 15:58:59 UTC (rev 25624)
+++ trunk/blender/source/Makefile 2009-12-30 16:18:06 UTC (rev 25625)
@@ -196,8 +196,6 @@
ifeq ($(WITH_OPENJPEG), true)
ifndef BF_OPENJPEG_LIBS
COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a
-else
-COMLIB += $(BF_OPENJPEG_LIBS)
endif
endif
Modified: trunk/blender/source/blender/editors/object/Makefile
===
--- trunk/blender/source/blender/editors/object/Makefile2009-12-30
15:58:59 UTC (rev 25624)
+++ trunk/blender/source/blender/editors/object/Makefile2009-12-30
16:18:06 UTC (rev 25625)
@@ -48,6 +48,8 @@
CPPFLAGS += -I../../python
CPPFLAGS += -I../../imbuf
CPPFLAGS += -I../../ikplugin
+CPPFLAGS += -I../../gpu
+CPPFLAGS += -I../../render/extern/include
# own include
Modified: trunk/blender/source/nan_link.mk
===
--- trunk/blender/source/nan_link.mk2009-12-30 15:58:59 UTC (rev 25624)
+++ trunk/blender/source/nan_link.mk2009-12-30 16:18:06 UTC (rev 25625)
@@ -177,4 +177,10 @@
LLIBS += $(BF_FFTW3_LIBS)
endif
+ifeq ($(WITH_OPENJPEG),true)
+ifneq (x$(BF_OPENJPEG_LIBS), x)
+LLIBS += $(BF_OPENJPEG_LIBS)
+endif
+endif
+
LLIBS += $(NAN_PYTHON_LIB)
___
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 [25626] trunk/blender: I had some extra stuff in last commit I didn't want to push.
Revision: 25626
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=25626
Author: sirdude
Date: 2009-12-30 17:29:12 +0100 (Wed, 30 Dec 2009)
Log Message:
---
I had some extra stuff in last commit I didn't want to push.
Reverting...
Kent
Modified Paths:
--
trunk/blender/intern/opennl/superlu/get_perm_c.c
trunk/blender/intern/opennl/superlu/sgstrf.c
trunk/blender/source/Makefile
trunk/blender/source/nan_link.mk
Modified: trunk/blender/intern/opennl/superlu/get_perm_c.c
===
--- trunk/blender/intern/opennl/superlu/get_perm_c.c2009-12-30 16:18:06 UTC
(rev 25625)
+++ trunk/blender/intern/opennl/superlu/get_perm_c.c2009-12-30 16:29:12 UTC
(rev 25626)
@@ -439,6 +439,8 @@
/* Transform perm_c into 0-based indexing. */
for (i = 0; i n; ++i) --perm_c[i];
+ SUPERLU_FREE(b_colptr);
+ SUPERLU_FREE(b_rowind);
SUPERLU_FREE(invp);
SUPERLU_FREE(dhead);
SUPERLU_FREE(qsize);
@@ -451,6 +453,5 @@
} else { /* Empty adjacency structure */
for (i = 0; i n; ++i) perm_c[i] = i;
}
-SUPERLU_FREE(b_colptr);
-SUPERLU_FREE(b_rowind);
+
}
Modified: trunk/blender/intern/opennl/superlu/sgstrf.c
===
--- trunk/blender/intern/opennl/superlu/sgstrf.c2009-12-30 16:18:06 UTC
(rev 25625)
+++ trunk/blender/intern/opennl/superlu/sgstrf.c2009-12-30 16:29:12 UTC
(rev 25626)
@@ -231,10 +231,7 @@
/* Allocate storage common to the factor routines */
*info = sLUMemInit(fact, work, lwork, m, n, Astore-nnz,
panel_size, L, U, Glu, iwork, swork);
-if ( *info ) {
- if ( *iwork) SUPERLU_FREE (iwork);
- return;
-}
+if ( *info ) return;
xsup= Glu.xsup;
supno = Glu.supno;
Modified: trunk/blender/source/Makefile
===
--- trunk/blender/source/Makefile 2009-12-30 16:18:06 UTC (rev 25625)
+++ trunk/blender/source/Makefile 2009-12-30 16:29:12 UTC (rev 25626)
@@ -196,6 +196,8 @@
ifeq ($(WITH_OPENJPEG), true)
ifndef BF_OPENJPEG_LIBS
COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a
+else
+COMLIB += $(BF_OPENJPEG_LIBS)
endif
endif
Modified: trunk/blender/source/nan_link.mk
===
--- trunk/blender/source/nan_link.mk2009-12-30 16:18:06 UTC (rev 25625)
+++ trunk/blender/source/nan_link.mk2009-12-30 16:29:12 UTC (rev 25626)
@@ -177,10 +177,4 @@
LLIBS += $(BF_FFTW3_LIBS)
endif
-ifeq ($(WITH_OPENJPEG),true)
-ifneq (x$(BF_OPENJPEG_LIBS), x)
-LLIBS += $(BF_OPENJPEG_LIBS)
-endif
-endif
-
LLIBS += $(NAN_PYTHON_LIB)
___
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 [25530] trunk/blender/intern/opennl/ superlu/sgstrf.c: This fixes the following coverity issues: 163 162 161
Revision: 25530
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=25530
Author: sirdude
Date: 2009-12-22 23:03:57 +0100 (Tue, 22 Dec 2009)
Log Message:
---
This fixes the following coverity issues: 163 162 161
Basically the function wasn't freeing memory it used before
returning.
Kent
Modified Paths:
--
trunk/blender/intern/opennl/superlu/sgstrf.c
Modified: trunk/blender/intern/opennl/superlu/sgstrf.c
===
--- trunk/blender/intern/opennl/superlu/sgstrf.c2009-12-22 19:56:12 UTC
(rev 25529)
+++ trunk/blender/intern/opennl/superlu/sgstrf.c2009-12-22 22:03:57 UTC
(rev 25530)
@@ -283,8 +283,12 @@
* -- */
/* Determine the union of the row structure of the snode */
if ( (*info = ssnode_dfs(jcol, kcol, asub, xa_begin, xa_end,
- xprune, marker, Glu)) != 0 )
+ xprune, marker, Glu)) != 0 ) {
+ if ( iperm_r_allocated ) SUPERLU_FREE (iperm_r);
+ SUPERLU_FREE (iperm_c);
+ SUPERLU_FREE (relax_end);
return;
+ }
nextu= xusub[jcol];
nextlu = xlusup[jcol];
@@ -293,8 +297,12 @@
new_next = nextlu + (xlsub[fsupc+1]-xlsub[fsupc])*(kcol-jcol+1);
nzlumax = Glu.nzlumax;
while ( new_next nzlumax ) {
- if ( (*info = sLUMemXpand(jcol, nextlu, LUSUP, nzlumax, Glu))
)
- return;
+ if ( (*info = sLUMemXpand(jcol, nextlu, LUSUP, nzlumax, Glu))
) {
+ if ( iperm_r_allocated ) SUPERLU_FREE (iperm_r);
+ SUPERLU_FREE (iperm_c);
+ SUPERLU_FREE (relax_end);
+ return;
+ }
}
for (icol = jcol; icol= kcol; icol++) {
@@ -350,17 +358,31 @@
if ((*info = scolumn_dfs(m, jj, perm_r, nseg, panel_lsub[k],
segrep, repfnz[k], xprune, marker,
- parent, xplore, Glu)) != 0) return;
+ parent, xplore, Glu)) != 0) {
+ if ( iperm_r_allocated ) SUPERLU_FREE (iperm_r);
+ SUPERLU_FREE (iperm_c);
+ SUPERLU_FREE (relax_end);
+ return;
+ }
/* Numeric updates */
if ((*info = scolumn_bmod(jj, (nseg - nseg1), dense[k],
tempv, segrep[nseg1], repfnz[k],
-jcol, Glu, stat)) != 0) return;
+jcol, Glu, stat)) != 0) {
+ if ( iperm_r_allocated ) SUPERLU_FREE (iperm_r);
+ SUPERLU_FREE (iperm_c);
+ SUPERLU_FREE (relax_end);
+ return;
+ }
/* Copy the U-segments to ucol[*] */
if ((*info = scopy_to_ucol(jj, nseg, segrep, repfnz[k],
- perm_r, dense[k], Glu)) != 0)
- return;
+ perm_r, dense[k], Glu)) != 0) {
+ if ( iperm_r_allocated ) SUPERLU_FREE (iperm_r);
+ SUPERLU_FREE (iperm_c);
+ SUPERLU_FREE (relax_end);
+ return;
+ }
if ( (*info = spivotL(jj, diag_pivot_thresh, usepr, perm_r,
iperm_r, iperm_c, pivrow, Glu, stat)) )
@@ -429,5 +451,4 @@
if ( iperm_r_allocated ) SUPERLU_FREE (iperm_r);
SUPERLU_FREE (iperm_c);
SUPERLU_FREE (relax_end);
-
}
___
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 [25446] trunk/blender: Some fixes to get blender compiling on solaris.
Revision: 25446
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=25446
Author: sirdude
Date: 2009-12-17 18:42:26 +0100 (Thu, 17 Dec 2009)
Log Message:
---
Some fixes to get blender compiling on solaris.
Kent
Modified Paths:
--
trunk/blender/intern/audaspace/SRC/Makefile
trunk/blender/source/Makefile
trunk/blender/source/blender/render/intern/raytrace/reorganize.h
trunk/blender/source/nan_link.mk
Modified: trunk/blender/intern/audaspace/SRC/Makefile
===
--- trunk/blender/intern/audaspace/SRC/Makefile 2009-12-17 17:34:56 UTC (rev
25445)
+++ trunk/blender/intern/audaspace/SRC/Makefile 2009-12-17 17:42:26 UTC (rev
25446)
@@ -35,7 +35,7 @@
CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
-CPPFLAGS += -I$(LCGDIR)/samplerate/include/
+CPPFLAGS += -I$(NAN_SAMPLERATE)/include
CPPFLAGS += -I../ffmpeg
CPPFLAGS += -I../FX
CPPFLAGS += -I../SDL
Modified: trunk/blender/source/Makefile
===
--- trunk/blender/source/Makefile 2009-12-17 17:34:56 UTC (rev 25445)
+++ trunk/blender/source/Makefile 2009-12-17 17:42:26 UTC (rev 25446)
@@ -118,6 +118,7 @@
COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a
COMLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
COMLIB += $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a
+COMLIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a
COMLIB += $(NAN_DECIMATION)/lib/$(DEBUG_DIR)libdecimation.a
ifeq ($(WITH_FFMPEG),true)
@@ -378,11 +379,6 @@
endif
endif
-ifeq ($(OS),solaris)
-PULIB += $(NAN_ZLIB)/lib/libz.a
-SPLIB += $(NAN_ZLIB)/lib/libz.a
-endif
-
ifeq ($(WITH_OPENAL),true)
ifeq ($(OS),$(findstring $(OS), freebsd linux windows))
ifeq ($(CPU),$(findstring $(CPU), i386 powerpc x86_64 parisc64))
Modified: trunk/blender/source/blender/render/intern/raytrace/reorganize.h
===
--- trunk/blender/source/blender/render/intern/raytrace/reorganize.h
2009-12-17 17:34:56 UTC (rev 25445)
+++ trunk/blender/source/blender/render/intern/raytrace/reorganize.h
2009-12-17 17:42:26 UTC (rev 25446)
@@ -39,6 +39,10 @@
extern int tot_pushup;
extern int tot_pushdown;
+#if !defined(INFINITY) defined(HUGE_VAL)
+#define INFINITY HUGE_VAL
+#endif
+
templateclass Node
bool node_fits_inside(Node *a, Node *b)
{
Modified: trunk/blender/source/nan_link.mk
===
--- trunk/blender/source/nan_link.mk2009-12-17 17:34:56 UTC (rev 25445)
+++ trunk/blender/source/nan_link.mk2009-12-17 17:42:26 UTC (rev 25446)
@@ -120,7 +120,7 @@
LLIBS += -L$(NAN_MESA)/lib
endif
-LLIBS += -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl
+LLIBS += $(NAN_ZLIB)/lib/libz.a -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm
-ldl -lsocket -lnsl
DYNLDFLAGS = -shared $(LDFLAGS)
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 [24368] trunk/blender/release/scripts/ui/ space_view3d_toolbar.py: Simple one liner....
Revision: 24368 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=24368 Author: sirdude Date: 2009-11-05 21:35:36 +0100 (Thu, 05 Nov 2009) Log Message: --- Simple one liner Added options to add Flip normals to toolbar. (iCer on irc is responsible) Kent Modified Paths: -- trunk/blender/release/scripts/ui/space_view3d_toolbar.py Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py === --- trunk/blender/release/scripts/ui/space_view3d_toolbar.py2009-11-05 20:32:46 UTC (rev 24367) +++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py2009-11-05 20:35:36 UTC (rev 24368) @@ -101,6 +101,7 @@ col.itemO(mesh.screw) col.itemO(mesh.merge) col.itemO(mesh.rip_move) +col.itemO(mesh.flip_normals) col = layout.column(align=True) col.itemL(text=Shading:) ___ 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 [23493] trunk/blender: Fixing up Makefiles , its not fully working but its closer...
Revision: 23493 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23493 Author: sirdude Date: 2009-09-25 20:47:43 +0200 (Fri, 25 Sep 2009) Log Message: --- Fixing up Makefiles, its not fully working but its closer... Kent Modified Paths: -- trunk/blender/intern/itasc/Makefile trunk/blender/intern/itasc/kdl/Makefile trunk/blender/intern/itasc/kdl/utilities/Makefile trunk/blender/source/Makefile trunk/blender/source/blender/ikplugin/intern/Makefile Modified: trunk/blender/intern/itasc/Makefile === --- trunk/blender/intern/itasc/Makefile 2009-09-25 16:57:30 UTC (rev 23492) +++ trunk/blender/intern/itasc/Makefile 2009-09-25 18:47:43 UTC (rev 23493) @@ -28,10 +28,13 @@ # iksolver main makefile. # +include nan_definitions.mk LIBNAME = itasc -DIR = $(OCGDIR)/intern/$(SOURCEDIR) - +SOURCEDIR = intern/$(LIBNAME) +DIR = $(OCGDIR)/$(SOURCEDIR) +DIRS = kdl +include nan_subdirs.mk include nan_compile.mk CPPFLAGS += -I. @@ -48,6 +51,4 @@ ranlib $(NAN_ITASC)/lib/debug/libitasc.a endif ## -DIRS = kdl -SOURCEDIR = intern/$(LIBNAME) include nan_subdirs.mk Modified: trunk/blender/intern/itasc/kdl/Makefile === --- trunk/blender/intern/itasc/kdl/Makefile 2009-09-25 16:57:30 UTC (rev 23492) +++ trunk/blender/intern/itasc/kdl/Makefile 2009-09-25 18:47:43 UTC (rev 23493) @@ -28,15 +28,15 @@ # iksolver main makefile. # +include nan_definitions.mk + LIBNAME = itasc DIR = $(OCGDIR)/intern/$(LIBNAME) +DIRS = utilities +SOURCEDIR = intern/$(LIBNAME)/kdl +include nan_subdirs.mk include nan_compile.mk CPPFLAGS += -I. CPPFLAGS += -I../../../extern/Eigen2 - -## -DIRS = utilities -SOURCEDIR = intern/$(LIBNAME)/kdl -include nan_subdirs.mk Modified: trunk/blender/intern/itasc/kdl/utilities/Makefile === --- trunk/blender/intern/itasc/kdl/utilities/Makefile 2009-09-25 16:57:30 UTC (rev 23492) +++ trunk/blender/intern/itasc/kdl/utilities/Makefile 2009-09-25 18:47:43 UTC (rev 23493) @@ -28,6 +28,8 @@ # iksolver main makefile. # +include nan_definitions.mk + LIBNAME = itasc DIR = $(OCGDIR)/intern/$(LIBNAME) Modified: trunk/blender/source/Makefile === --- trunk/blender/source/Makefile 2009-09-25 16:57:30 UTC (rev 23492) +++ trunk/blender/source/Makefile 2009-09-25 18:47:43 UTC (rev 23493) @@ -98,7 +98,9 @@ COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a +COMLIB += $(OCGDIR)/blender/ikplugin/$(DEBUG_DIR)libikplugin.a COMLIB += $(NAN_IKSOLVER)/lib/$(DEBUG_DIR)libiksolver.a +COMLIB += $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc.a COMLIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a COMLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a Modified: trunk/blender/source/blender/ikplugin/intern/Makefile === --- trunk/blender/source/blender/ikplugin/intern/Makefile 2009-09-25 16:57:30 UTC (rev 23492) +++ trunk/blender/source/blender/ikplugin/intern/Makefile 2009-09-25 18:47:43 UTC (rev 23493) @@ -36,8 +36,8 @@ CFLAGS += -I../../blenkernel CFLAGS += -I../../blenlib CFLAGS += -I../../include -CFLAGS += -I../../../intern/itasc -CFLAGS += -I../../../extern/Eigen2 +CFLAGS += -I../../../../intern/itasc +CFLAGS += -I../../../../extern/Eigen2 CFLAGS += -I.. CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include @@ -46,4 +46,6 @@ CPPFLAGS += -I../../blenkernel CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../include +CPPFLAGS += -I../../../../intern/itasc +CPPFLAGS += -I../../../../extern/Eigen2 CPPFLAGS += -I.. ___ 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 [23221] trunk/blender/extern: Fixing CRLF by changing style to native...
Revision: 23221 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23221 Author: sirdude Date: 2009-09-14 16:45:32 +0200 (Mon, 14 Sep 2009) Log Message: --- Fixing CRLF by changing style to native... (There were a couple of files that had mixed) Kent Modified Paths: -- trunk/blender/extern/bullet2/src/Bullet-C-Api.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btActionInterface.h
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23127] branches/blender2.5/blender/source /nan_link.mk: Added in runtime path for python since were using a dynamic lib.
Revision: 23127 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23127 Author: sirdude Date: 2009-09-11 16:31:05 +0200 (Fri, 11 Sep 2009) Log Message: --- Added in runtime path for python since were using a dynamic lib. (for Makefiles on linux) Kent Modified Paths: -- branches/blender2.5/blender/source/nan_link.mk Modified: branches/blender2.5/blender/source/nan_link.mk === --- branches/blender2.5/blender/source/nan_link.mk 2009-09-11 12:44:09 UTC (rev 23126) +++ branches/blender2.5/blender/source/nan_link.mk 2009-09-11 14:31:05 UTC (rev 23127) @@ -97,7 +97,7 @@ COMMENT = MESA 3.1 LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi LLIBS += -lutil -lc -lm -ldl -lpthread -LLIBS += -lpython$(NAN_PYTHON_VERSION) +LLIBS += -L$(NAN_PYTHON)/lib -Wl,-rpath -Wl,$(NAN_PYTHON)/lib -lpython$(NAN_PYTHON_VERSION) LOPTS = -export-dynamic DADD = -lGL -lGLU SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a ___ 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 [21862] trunk/blender/source/blender/imbuf /intern/iris.c: This is patch# 19017 16bit SGI image loading
Revision: 21862
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=21862
Author: sirdude
Date: 2009-07-24 19:17:04 +0200 (Fri, 24 Jul 2009)
Log Message:
---
This is patch# 19017 16bit SGI image loading
submitted by Albertas Vy?\197?\161niauskas (thezbyg)
Improves SGI image support.
Kent
Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/iris.c
Modified: trunk/blender/source/blender/imbuf/intern/iris.c
===
--- trunk/blender/source/blender/imbuf/intern/iris.c2009-07-24 16:41:12 UTC
(rev 21861)
+++ trunk/blender/source/blender/imbuf/intern/iris.c2009-07-24 17:17:04 UTC
(rev 21862)
@@ -104,7 +104,9 @@
static void readtab(FILE *inf, unsigned int *tab, int len);
static void expandrow(unsigned char *optr, unsigned char *iptr, int z);
+static void expandrow2(float *optr, unsigned char *iptr, int z);
static void interleaverow(unsigned char *lptr, unsigned char *cptr, int z, int
n);
+static void interleaverow2(float *lptr, unsigned char *cptr, int z, int n);
static int compressrow(unsigned char *lbuf, unsigned char *rlebuf, int z, int
cnt);
static void lumrow(unsigned char *rgbptr, unsigned char *lumptr, int n);
@@ -233,6 +235,7 @@
struct ImBuf *imb_loadiris(unsigned char *mem, int flags)
{
unsigned int *base, *lptr = NULL;
+ float *fbase, *fptr = NULL;
unsigned int *zbase, *zptr;
unsigned char *rledat;
unsigned int *starttab, *lengthtab;
@@ -257,8 +260,8 @@
rle = ISRLE(image.type);
bpp = BPP(image.type);
- if(bpp != 1 ) {
- fprintf(stderr,longimagedata: image must have 1 byte per pix
chan\n);
+ if(bpp != 1 bpp != 2) {
+ fprintf(stderr,longimagedata: image must have 1 or 2 byte per
pix chan\n);
return(0);
}
@@ -273,6 +276,7 @@
}
if (rle) {
+
tablen = ysize*zsize*sizeof(int);
starttab = (unsigned int *)malloc(tablen);
lengthtab = (unsigned int *)malloc(tablen);
@@ -280,7 +284,7 @@
readtab(inf,starttab,tablen);
readtab(inf,lengthtab,tablen);
-
+
/* check data order */
cur = 0;
badorder = 0;
@@ -295,99 +299,200 @@
if(badorder)
break;
}
-
- ibuf = IMB_allocImBuf(xsize, ysize, 8 * zsize, IB_rect, 0);
- if (ibuf-depth 32) ibuf-depth = 32;
- base = ibuf-rect;
- zbase = (unsigned int *)ibuf-zbuf;
-
- if (badorder) {
- for(z=0; zzsize; z++) {
+
+ if (bpp == 1) {
+
+ ibuf = IMB_allocImBuf(xsize, ysize, 8 * zsize, IB_rect,
0);
+ if (ibuf-depth 32) ibuf-depth = 32;
+ base = ibuf-rect;
+ zbase = (unsigned int *)ibuf-zbuf;
+
+ if (badorder) {
+ for(z=0; zzsize; z++) {
+ lptr = base;
+ for(y=0; yysize; y++) {
+ file_offset =
starttab[y+z*ysize];
+
+ rledat = file_data +
file_offset;
+ file_offset +=
lengthtab[y+z*ysize];
+
+ expandrow((uchar *)lptr,
rledat, 3-z);
+ lptr += xsize;
+ }
+ }
+ } else {
lptr = base;
+ zptr = zbase;
for(y=0; yysize; y++) {
- file_offset = starttab[y+z*ysize];
-
- rledat = file_data + file_offset;
- file_offset += lengthtab[y+z*ysize];
-
- expandrow((uchar *)lptr, rledat, 3-z);
+
+ for(z=0; zzsize; z++) {
+
+ file_offset =
starttab[y+z*ysize];
+
+ rledat = file_data +
file_offset;
+ file_offset +=
lengthtab[y+z*ysize];
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20976] trunk/blender/source/blender/ render/intern/source/texture.c: coverity issue CID: 596
Revision: 20976
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20976
Author: sirdude
Date: 2009-06-18 14:57:39 +0200 (Thu, 18 Jun 2009)
Log Message:
---
coverity issue CID: 596
Checker: FORWARD_NULL (help)
File: base/src/source/blender/render/intern/source/texture.c
Function: do_lamp_tex
Description: Variable dx tracked as NULL was dereferenced.
Also found a typo the 3rd check was checking projx instead of projz
I also expanded the elses to set dyt as well as dxt.
Kent
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/texture.c
Modified: trunk/blender/source/blender/render/intern/source/texture.c
===
--- trunk/blender/source/blender/render/intern/source/texture.c 2009-06-18
11:42:30 UTC (rev 20975)
+++ trunk/blender/source/blender/render/intern/source/texture.c 2009-06-18
12:57:39 UTC (rev 20976)
@@ -2354,7 +2354,7 @@
TexResult texres= {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
float *co = NULL, *dx = NULL, *dy = NULL, fact, stencilTin=1.0;
float texvec[3], dxt[3], dyt[3], tempvec[3];
- int tex_nr, rgb= 0;
+ int i, tex_nr, rgb= 0;
if (R.r.scemode R_NO_TEX) return;
tex_nr= 0;
@@ -2430,21 +2430,33 @@
else texvec[2]= mtex-size[2]*(mtex-ofs[2]);
if(shi-osatex) {
- if(mtex-projx) {
- dxt[0]= mtex-size[0]*dx[mtex-projx-1];
- dyt[0]= mtex-size[0]*dy[mtex-projx-1];
+ if (!dx) {
+ for(i=0;i2;i++) {
+ dxt[i] = dyt[i] = 0.0;
+ }
+ } else {
+ if(mtex-projx) {
+ dxt[0]=
mtex-size[0]*dx[mtex-projx-1];
+ dyt[0]=
mtex-size[0]*dy[mtex-projx-1];
+ } else {
+ dxt[0]= 0.0;
+ dyt[0]= 0.0;
+ }
+ if(mtex-projy) {
+ dxt[1]=
mtex-size[1]*dx[mtex-projy-1];
+ dyt[1]=
mtex-size[1]*dy[mtex-projy-1];
+ } else {
+ dxt[1]= 0.0;
+ dyt[1]= 0.0;
+ }
+ if(mtex-projz) {
+ dxt[2]=
mtex-size[2]*dx[mtex-projz-1];
+ dyt[2]=
mtex-size[2]*dy[mtex-projz-1];
+ } else {
+ dxt[2]= 0.0;
+ dyt[2]= 0.0;
+ }
}
- else dxt[0]= 0.0;
- if(mtex-projy) {
- dxt[1]= mtex-size[1]*dx[mtex-projy-1];
- dyt[1]= mtex-size[1]*dy[mtex-projy-1];
- }
- else dxt[1]= 0.0;
- if(mtex-projx) {
- dxt[2]= mtex-size[2]*dx[mtex-projz-1];
- dyt[2]= mtex-size[2]*dy[mtex-projz-1];
- }
- else dxt[2]= 0.0;
}
/* texture */
___
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 [20859] trunk/blender/source/blender/ render/intern/source/texture.c: coverity issue CID: 44
Revision: 20859
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20859
Author: sirdude
Date: 2009-06-13 17:54:39 +0200 (Sat, 13 Jun 2009)
Log Message:
---
coverity issue CID: 44
Checker: FORWARD_NULL (help)
File: base/src/source/blender/render/intern/source/texture.c
Function: do_lamp_tex
Description: Variable co tracked as NULL was dereferenced.
co was set to NULL at the beginning of the function and it could
possibly slip through all the logic above so lets test it before
we use it blindly.
Kent
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/texture.c
Modified: trunk/blender/source/blender/render/intern/source/texture.c
===
--- trunk/blender/source/blender/render/intern/source/texture.c 2009-06-13
14:58:39 UTC (rev 20858)
+++ trunk/blender/source/blender/render/intern/source/texture.c 2009-06-13
15:54:39 UTC (rev 20859)
@@ -2420,13 +2420,13 @@
/* placement */
- if(mtex-projx) texvec[0]=
mtex-size[0]*(co[mtex-projx-1]+mtex-ofs[0]);
+ if(mtex-projx co) texvec[0]=
mtex-size[0]*(co[mtex-projx-1]+mtex-ofs[0]);
else texvec[0]= mtex-size[0]*(mtex-ofs[0]);
- if(mtex-projy) texvec[1]=
mtex-size[1]*(co[mtex-projy-1]+mtex-ofs[1]);
+ if(mtex-projy co) texvec[1]=
mtex-size[1]*(co[mtex-projy-1]+mtex-ofs[1]);
else texvec[1]= mtex-size[1]*(mtex-ofs[1]);
- if(mtex-projz) texvec[2]=
mtex-size[2]*(co[mtex-projz-1]+mtex-ofs[2]);
+ if(mtex-projz co) texvec[2]=
mtex-size[2]*(co[mtex-projz-1]+mtex-ofs[2]);
else texvec[2]= mtex-size[2]*(mtex-ofs[2]);
if(shi-osatex) {
___
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 [20860] trunk/blender/source/blender/gpu/ intern/gpu_material.c: coverity issue CID: 228
Revision: 20860 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20860 Author: sirdude Date: 2009-06-13 18:49:30 +0200 (Sat, 13 Jun 2009) Log Message: --- coverity issue CID: 228 Checker: DEADCODE (help) File: base/src/source/blender/gpu/intern/gpu_material.c Function: GPU_materials_free Description: Conditional ma != 0 was looping over wrong variable I'm guessing a cut and paste error from above. Kent Modified Paths: -- trunk/blender/source/blender/gpu/intern/gpu_material.c Modified: trunk/blender/source/blender/gpu/intern/gpu_material.c === --- trunk/blender/source/blender/gpu/intern/gpu_material.c 2009-06-13 15:54:39 UTC (rev 20859) +++ trunk/blender/source/blender/gpu/intern/gpu_material.c 2009-06-13 16:49:30 UTC (rev 20860) @@ -1285,7 +1285,7 @@ GPU_material_free(defmaterial); - for(ob=G.main-object.first; ma; ma=ma-id.next) + for(ob=G.main-object.first; ob; ob=ob-id.next) GPU_lamp_free(ob); } ___ 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 [20861] trunk/blender/source/blender/imbuf /intern/radiance_hdr.c: coverity issue CID: 401
Revision: 20861
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20861
Author: sirdude
Date: 2009-06-13 18:52:01 +0200 (Sat, 13 Jun 2009)
Log Message:
---
coverity issue CID: 401
Checker: NULL_RETURNS (help)
File: base/src/source/blender/imbuf/intern/radiance_hdr.c
Function: imb_loadhdr
Description: Incrementing possibly NULL value ptr
Make sure were not trying to index past our array.
Kent
Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
Modified: trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
===
--- trunk/blender/source/blender/imbuf/intern/radiance_hdr.c2009-06-13
16:49:30 UTC (rev 20860)
+++ trunk/blender/source/blender/imbuf/intern/radiance_hdr.c2009-06-13
16:52:01 UTC (rev 20861)
@@ -191,7 +191,7 @@
break;
}
}
- if (found) {
+ if (found (x(size + 2))) {
if (sscanf((char *)mem[x+1], %79s %d %79s %d,
(char*)oriY, height,
(char*)oriX, width) != 4) return NULL;
___
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 [20862] trunk/blender/source/blender/ blenkernel/intern/BME_tools.c: coverity issue CID: 469
Revision: 20862
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20862
Author: sirdude
Date: 2009-06-13 18:57:26 +0200 (Sat, 13 Jun 2009)
Log Message:
---
coverity issue CID: 469
Checker: REVERSE_INULL (help)
File: base/src/source/blender/blenkernel/intern/BME_tools.c
Function: BME_split_face
Description: Pointer example dereferenced before NULL check
Check for null before we try to use it.
Kent
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/BME_tools.c
Modified: trunk/blender/source/blender/blenkernel/intern/BME_tools.c
===
--- trunk/blender/source/blender/blenkernel/intern/BME_tools.c 2009-06-13
16:52:01 UTC (rev 20861)
+++ trunk/blender/source/blender/blenkernel/intern/BME_tools.c 2009-06-13
16:57:26 UTC (rev 20862)
@@ -192,7 +192,7 @@
nf = BME_SFME(bm,f,v1,v2,nl);
nf-flag = f-flag;
/* if the edge was selected, select this face, too */
- if (example-flag SELECT) f-flag |= ME_FACE_SEL;
+ if (example (example-flag SELECT)) f-flag |= ME_FACE_SEL;
nf-h = f-h;
nf-mat_nr = f-mat_nr;
if (nl example) {
___
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 [20867] trunk/blender/source/blender/ blenkernel/intern/modifier.c: coverity issue CID: 307
Revision: 20867
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20867
Author: sirdude
Date: 2009-06-14 00:23:24 +0200 (Sun, 14 Jun 2009)
Log Message:
---
coverity issue CID: 307
Checker: FORWARD_NULL (help)
File: base/src/source/blender/blenkernel/intern/modifier.c
Function: meshdeformModifier_deformVerts
Description: Variable dm tracked as NULL was passed to a function that
dereferences it.
fix provided by Brecht.
Kent
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/modifier.c
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2009-06-13
21:45:13 UTC (rev 20866)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2009-06-13
22:23:24 UTC (rev 20867)
@@ -7813,11 +7813,13 @@
{
DerivedMesh *dm;
- if(!derivedData ob-type==OB_MESH)
- dm= CDDM_from_mesh(ob-data, ob);
- else
- dm= derivedData;
+ if (!derivedData) {
+ dm= get_original_dm(ob, NULL, 0);
+ if (dm == NULL) return;
+ }
+ else dm= derivedData;
+
modifier_vgroup_cache(md, vertexCos); /* if next modifier needs
original vertices */
meshdeformModifier_do(md, ob, dm, vertexCos, numVerts);
___
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 [20868] trunk/blender/source/blender/gpu/ intern/gpu_extensions.c: coverity issue CID: 275
Revision: 20868
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20868
Author: sirdude
Date: 2009-06-14 00:31:14 +0200 (Sun, 14 Jun 2009)
Log Message:
---
coverity issue CID: 275
Checker: FORWARD_NULL (help)
File: base/src/source/blender/gpu/intern/gpu_extensions.c
Function: GPU_shader_create
Description: Variable fragcode tracked as NULL was passed to a function that
dereferences it.
fix provided by Brecht. :)
Kent
Modified Paths:
--
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c2009-06-13
22:23:24 UTC (rev 20867)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c2009-06-13
22:31:14 UTC (rev 20868)
@@ -746,7 +746,9 @@
glGetObjectParameterivARB(shader-object, GL_OBJECT_LINK_STATUS_ARB,
status);
if (!status) {
glGetInfoLogARB(shader-object, sizeof(log), length, log);
- shader_print_errors(linking, log, fragcode);
+ if (fragecode) shader_print_errors(linking, log, fragcode);
+ else if (vertexcode) shader_print_errors(linking, log,
vertexcode);
+ else if (libcode) shader_print_errors(linking, log, libcode);
GPU_shader_free(shader);
return NULL;
___
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 [20843] trunk/blender/source/blender/ blenlib/intern/freetypefont.c: coverity issue CID: 523
Revision: 20843
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20843
Author: sirdude
Date: 2009-06-13 05:08:58 +0200 (Sat, 13 Jun 2009)
Log Message:
---
coverity issue CID: 523
Checker: UNINIT (help)
File: base/src/source/blender/blenlib/intern/freetypefont.c
Function: objchr_to_ftvfontdata
Description: Using uninitialized value face in call to function
freetypechar_to_vchar
freetypechar_to_vchar expects face to be defined so we need to
return before then if we have a problem. Also it doesn't
make sense to not return FALSE if there is an error because we
didn't do anything.
Kent
Modified Paths:
--
trunk/blender/source/blender/blenlib/intern/freetypefont.c
Modified: trunk/blender/source/blender/blenlib/intern/freetypefont.c
===
--- trunk/blender/source/blender/blenlib/intern/freetypefont.c 2009-06-13
03:05:20 UTC (rev 20842)
+++ trunk/blender/source/blender/blenlib/intern/freetypefont.c 2009-06-13
03:08:58 UTC (rev 20843)
@@ -301,9 +301,12 @@
tf-pf-size,
0,
face);
+ if (err) return FALSE;
}
- else
- err= TRUE;
+ else {
+ err = TRUE;
+ return FALSE;
+ }
// Read the char
freetypechar_to_vchar(face, charcode, vfont-data);
___
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 [20659] trunk/blender/source/blender/src/ poseobject.c: A bunch of the same logic issues.
Revision: 20659
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20659
Author: sirdude
Date: 2009-06-05 19:45:17 +0200 (Fri, 05 Jun 2009)
Log Message:
---
A bunch of the same logic issues. (missed these before)
Kent
Modified Paths:
--
trunk/blender/source/blender/src/poseobject.c
Modified: trunk/blender/source/blender/src/poseobject.c
===
--- trunk/blender/source/blender/src/poseobject.c 2009-06-05 16:54:06 UTC
(rev 20658)
+++ trunk/blender/source/blender/src/poseobject.c 2009-06-05 17:45:17 UTC
(rev 20659)
@@ -445,7 +445,7 @@
bConstraint *con;
/* paranoia checks */
- if (!ob !ob-pose) return;
+ if (!ob || !ob-pose) return;
if (ob==G.obedit || (ob-flag OB_POSEMODE)==0) return;
for(pchan= ob-pose-chanbase.first; pchan; pchan= pchan-next) {
@@ -491,7 +491,7 @@
Bone *curbone, *pabone, *chbone;
/* paranoia checks */
- if (!ob !ob-pose) return;
+ if (!ob || !ob-pose) return;
if (ob==G.obedit || (ob-flag OB_POSEMODE)==0) return;
for(pchan= ob-pose-chanbase.first; pchan; pchan= pchan-next) {
@@ -583,7 +583,7 @@
Object *ob= OBACT;
/* paranoia checks */
- if(!ob !ob-pose) return;
+ if(!ob || !ob-pose) return;
if(ob==G.obedit || (ob-flag OB_POSEMODE)==0) return;
add_constraint(1); /* 1 means only IK */
@@ -599,7 +599,7 @@
bConstraint *next;
/* paranoia checks */
- if(!ob !ob-pose) return;
+ if(!ob || !ob-pose) return;
if(ob==G.obedit || (ob-flag OB_POSEMODE)==0) return;
if(pose_has_protected_selected(ob, 0, 1))
@@ -640,7 +640,7 @@
bPoseChannel *pchan;
/* paranoia checks */
- if(!ob !ob-pose) return;
+ if(!ob || !ob-pose) return;
if(ob==G.obedit || (ob-flag OB_POSEMODE)==0) return;
if(pose_has_protected_selected(ob, 0, 1))
@@ -1352,7 +1352,7 @@
char newname[32];
/* paranoia checks */
- if(!ob !ob-pose) return;
+ if(!ob || !ob-pose) return;
if(ob==G.obedit || (ob-flag OB_POSEMODE)==0) return;
if(pose_has_protected_selected(ob, 0, 1))
___
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 [20630] trunk/blender/source/blender/src/ hddaudio.c: coverity issue CID: 488
Revision: 20630
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20630
Author: sirdude
Date: 2009-06-04 17:58:47 +0200 (Thu, 04 Jun 2009)
Log Message:
---
coverity issue CID: 488
Checker: REVERSE_INULL (help)
File: base/src/source/blender/src/hddaudio.c
Function: sound_hdaudio_extract_small_block
Description: Pointer hdaudio dereferenced before NULL check
Moved some init code that uses a pointer to after the check
to see if pointer is valid.
Kent
Modified Paths:
--
trunk/blender/source/blender/src/hddaudio.c
Modified: trunk/blender/source/blender/src/hddaudio.c
===
--- trunk/blender/source/blender/src/hddaudio.c 2009-06-04 15:44:43 UTC (rev
20629)
+++ trunk/blender/source/blender/src/hddaudio.c 2009-06-04 15:58:47 UTC (rev
20630)
@@ -316,20 +316,22 @@
int nb_samples /* in target */)
{
AVPacket packet;
- int frame_position;
- int frame_size = (long long) target_rate
+ int frame_position, frame_size, in_frame_size, rate_conversion;
+ int sample_ofs;
+
+ if (hdaudio == 0) return;
+
+ frame_size = (long long) target_rate
* hdaudio-frame_duration / AV_TIME_BASE;
- int in_frame_size = (long long) hdaudio-sample_rate
+ in_frame_size = (long long) hdaudio-sample_rate
* hdaudio-frame_duration / AV_TIME_BASE;
- int rate_conversion =
+ rate_conversion =
(target_rate != hdaudio-sample_rate)
|| (target_channels != hdaudio-channels);
- int sample_ofs = target_channels * (sample_position % frame_size);
+ sample_ofs = target_channels * (sample_position % frame_size);
frame_position = sample_position / frame_size;
- if (hdaudio == 0) return;
-
if (rate_conversion) {
sound_hdaudio_init_resampler(
hdaudio, frame_position,
___
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 [20643] trunk/blender/source/blender/imbuf /intern/anim.c: coverity issue CID: 484
Revision: 20643
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20643
Author: sirdude
Date: 2009-06-05 05:40:58 +0200 (Fri, 05 Jun 2009)
Log Message:
---
coverity issue CID: 484
Checker: REVERSE_INULL (help)
File: base/src/source/blender/imbuf/intern/anim.c
Function: IMB_anim_absolute
Description: Pointer anim dereferenced before NULL check
again moving init code after check to valid pointer.
Kent
Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/anim.c
Modified: trunk/blender/source/blender/imbuf/intern/anim.c
===
--- trunk/blender/source/blender/imbuf/intern/anim.c2009-06-05 03:24:06 UTC
(rev 20642)
+++ trunk/blender/source/blender/imbuf/intern/anim.c2009-06-05 03:40:58 UTC
(rev 20643)
@@ -1046,10 +1046,11 @@
char head[256], tail[256];
unsigned short digits;
int pic;
- int filter_y = (anim-ib_flags IB_animdeinterlace);
-
+ int filter_y;
if (anim == NULL) return(0);
+ filter_y = (anim-ib_flags IB_animdeinterlace);
+
if (anim-curtype == 0) {
ibuf = anim_getnew(anim);
if (ibuf == NULL) {
___
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 [20644] trunk/blender/source/blender/src/ editparticle.c: coverity issues:
Revision: 20644
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20644
Author: sirdude
Date: 2009-06-05 05:52:24 +0200 (Fri, 05 Jun 2009)
Log Message:
---
coverity issues:
CID: 506
Checker: REVERSE_INULL (help)
File: base/src/source/blender/src/editparticle.c
Function: PE_mirror_x
Description: Pointer (edit)-keys dereferenced before NULL check
and
CID: 507
Checker: REVERSE_INULL (help)
File: base/src/source/blender/src/editparticle.c
Function: PE_mirror_x
Description: Pointer (psys)-particles dereferenced before NULL check
No need to copy the memory if the pointer isn't valid.
Kent
Modified Paths:
--
trunk/blender/source/blender/src/editparticle.c
Modified: trunk/blender/source/blender/src/editparticle.c
===
--- trunk/blender/source/blender/src/editparticle.c 2009-06-05 03:40:58 UTC
(rev 20643)
+++ trunk/blender/source/blender/src/editparticle.c 2009-06-05 03:52:24 UTC
(rev 20644)
@@ -2844,13 +2844,16 @@
new_pars= MEM_callocN(newtotpart*sizeof(ParticleData),
ParticleData new);
new_keys= MEM_callocN(newtotpart*sizeof(ParticleEditKey*),
ParticleEditKey new);
- memcpy(new_pars, psys-particles, totpart*sizeof(ParticleData));
- memcpy(new_keys, edit-keys, totpart*sizeof(ParticleEditKey*));
-
- if(psys-particles) MEM_freeN(psys-particles);
+ if(psys-particles) {
+ memcpy(new_pars, psys-particles,
totpart*sizeof(ParticleData));
+ MEM_freeN(psys-particles);
+ }
psys-particles= new_pars;
- if(edit-keys) MEM_freeN(edit-keys);
+ if(edit-keys) {
+ memcpy(new_keys, edit-keys,
totpart*sizeof(ParticleEditKey*));
+ MEM_freeN(edit-keys);
+ }
edit-keys= new_keys;
if(edit-mirror_cache) {
___
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 [20645] trunk/blender/source/blender/ blenkernel/intern/softbody.c: coverity issues:
Revision: 20645
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20645
Author: sirdude
Date: 2009-06-05 06:15:19 +0200 (Fri, 05 Jun 2009)
Log Message:
---
coverity issues:
CID: 478
Checker: REVERSE_INULL (help)
File: base/src/source/blender/blenkernel/intern/softbody.c
Function: apply_spring_memory
Description: Pointer sb dereferenced before NULL check
and
CID: 480
Checker: REVERSE_INULL (help)
File: base/src/source/blender/blenkernel/intern/softbody.c
Function: springs_from_particles
Description: Pointer ob dereferenced before NULL check
again moved assignment after check to make sure pointer is valid.
Kent
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/softbody.c
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2009-06-05
03:52:24 UTC (rev 20644)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2009-06-05
04:15:19 UTC (rev 20645)
@@ -3075,8 +3075,8 @@
int a;
float b,l,r;
-b = sb-plastic;
if (sb sb-totspring){
+ b = sb-plastic;
for(a=0; asb-totspring; a++) {
bs = sb-bspring[a];
bp1 =sb-bpoint[bs-v1];
@@ -3546,9 +3546,9 @@
int a,k;
float hairmat[4][4];
- psys= ob-soft-particles;
- sb= ob-soft;
- if(ob sb psys) {
+ if(ob ob-soft ob-soft-particles) {
+ psys= ob-soft-particles;
+ sb= ob-soft;
psmd = psys_get_modifier(ob, psys);
bp= sb-bpoint;
___
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 [20602] trunk/blender/source/blender/ blenkernel/intern/cloth.c: Missed this one before.
Revision: 20602 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20602 Author: sirdude Date: 2009-06-03 17:14:09 +0200 (Wed, 03 Jun 2009) Log Message: --- Missed this one before. It's another coverity issue: CID: 477 Checker: REVERSE_INULL (help) File: base/src/source/blender/blenkernel/intern/cloth.c Function: cloth_apply_vgroup Description: Pointer dm dereferenced before NULL check Just like the others it assigned the value twice, removed the one that was before checking for NULL. Kent Modified Paths: -- trunk/blender/source/blender/blenkernel/intern/cloth.c Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c === --- trunk/blender/source/blender/blenkernel/intern/cloth.c 2009-06-03 14:55:41 UTC (rev 20601) +++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2009-06-03 15:14:09 UTC (rev 20602) @@ -786,15 +786,14 @@ int j = 0; MDeformVert *dvert = NULL; Cloth *clothObj = NULL; - int numverts = dm-getNumVerts ( dm ); + int numverts; float goalfac = 0; ClothVertex *verts = NULL; + if (!clmd || !dm) return; + clothObj = clmd-clothObject; - if ( !dm ) - return; - numverts = dm-getNumVerts ( dm ); verts = clothObj-verts; ___ 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 [20604] trunk/blender/source/blender/src/ toolbox.c: coverity CID: 374
Revision: 20604
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20604
Author: sirdude
Date: 2009-06-03 17:24:42 +0200 (Wed, 03 Jun 2009)
Log Message:
---
coverity CID: 374
Checker: FORWARD_NULL (help)
File: base/src/source/blender/src/toolbox.c
Function: tb_do_render
Description: Variable ca tracked as NULL was dereferenced.
Moved check for null to include else statement.
Kent
Modified Paths:
--
trunk/blender/source/blender/src/toolbox.c
Modified: trunk/blender/source/blender/src/toolbox.c
===
--- trunk/blender/source/blender/src/toolbox.c 2009-06-03 15:17:52 UTC (rev
20603)
+++ trunk/blender/source/blender/src/toolbox.c 2009-06-03 15:24:42 UTC (rev
20604)
@@ -1545,10 +1545,12 @@
ca= G.vd-camera-data;
else return;
- if (ca (ca-flag CAM_SHOWPASSEPARTOUT))
- ca-flag = ~CAM_SHOWPASSEPARTOUT;
- else
- ca-flag |= CAM_SHOWPASSEPARTOUT;
+ if (ca) {
+ if (ca-flag CAM_SHOWPASSEPARTOUT)
+ ca-flag = ~CAM_SHOWPASSEPARTOUT;
+ else
+ ca-flag |= CAM_SHOWPASSEPARTOUT;
+ }
allqueue(REDRAWVIEW3D, 0);
}
break;
___
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 [20609] trunk/blender/release/Makefile: Make release wasn't stripping the gameplayer
Revision: 20609 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20609 Author: sirdude Date: 2009-06-03 23:03:44 +0200 (Wed, 03 Jun 2009) Log Message: --- Make release wasn't stripping the gameplayer (typo) Kent Modified Paths: -- trunk/blender/release/Makefile Modified: trunk/blender/release/Makefile === --- trunk/blender/release/Makefile 2009-06-03 21:02:46 UTC (rev 20608) +++ trunk/blender/release/Makefile 2009-06-03 21:03:44 UTC (rev 20609) @@ -176,7 +176,7 @@ else @strip -x $(DISTDIR)/blender$(EXT0) @if [ -f $(DISTDIR)/blenderplayer$(EXTO) ]; then \ - strip -x $(DISTDIR)/blender$(EXT0) ; \ + strip -x $(DISTDIR)/blenderplayer$(EXT0) ; \ fi endif 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 [20584] trunk/blender/source/blender/ blenkernel/intern/cloth.c: This commit fixes the following two coverity issues:
Revision: 20584
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20584
Author: sirdude
Date: 2009-06-02 21:29:20 +0200 (Tue, 02 Jun 2009)
Log Message:
---
This commit fixes the following two coverity issues:
CID: 475
Checker: REVERSE_INULL (help)
File: base/src/source/blender/blenkernel/intern/cloth.c
Function: bvhselftree_build_from_cloth
Description: Pointer clmd dereferenced before NULL check
CID: 476
Checker: REVERSE_INULL (help)
File: base/src/source/blender/blenkernel/intern/cloth.c
Function: bvhtree_build_from_cloth
Description: Pointer clmd dereferenced before NULL check
You'll notice in the code the var is actually set again
a few lines down before being used so better to set it
after you've made sure the pointer is valid.
Kent
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/cloth.c
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2009-06-02
18:10:06 UTC (rev 20583)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2009-06-02
19:29:20 UTC (rev 20584)
@@ -157,7 +157,7 @@
{
unsigned int i;
BVHTree *bvhtree;
- Cloth *cloth = clmd-clothObject;
+ Cloth *cloth;
ClothVertex *verts;
MFace *mfaces;
float co[12];
@@ -198,7 +198,7 @@
{
unsigned int i;
BVHTree *bvhtree;
- Cloth *cloth = clmd-clothObject;
+ Cloth *cloth;
ClothVertex *verts;
MFace *mfaces;
float co[12];
___
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 [20508] trunk/blender/extern/libopenjpeg/ jp2.c: This was found by coverity
Revision: 20508
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20508
Author: sirdude
Date: 2009-05-29 21:11:04 +0200 (Fri, 29 May 2009)
Log Message:
---
This was found by coverity
CID: 568
Checker: FORWARD_NULL (help)
File: base/src/extern/libopenjpeg/jp2.c
Function: jp2_decode
Description: Variable image tracked as NULL was dereferenced.
fixed by just updating to latest version of the file from
external svn branch.
Kent
Modified Paths:
--
trunk/blender/extern/libopenjpeg/jp2.c
Modified: trunk/blender/extern/libopenjpeg/jp2.c
===
--- trunk/blender/extern/libopenjpeg/jp2.c 2009-05-29 18:51:25 UTC (rev
20507)
+++ trunk/blender/extern/libopenjpeg/jp2.c 2009-05-29 19:11:04 UTC (rev
20508)
@@ -561,6 +561,7 @@
image = j2k_decode(jp2-j2k, cio, cstr_info);
if(!image) {
opj_event_msg(cinfo, EVT_ERROR, Failed to decode J2K image\n);
+ return NULL;
}
/* Set Image Color Space */
___
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 [20461] trunk/blender/extern/ffmpeg/ libavcodec/eval.c: Fix to get ffmpeg working on solaris.
Revision: 20461 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20461 Author: sirdude Date: 2009-05-28 04:12:28 +0200 (Thu, 28 May 2009) Log Message: --- Fix to get ffmpeg working on solaris. Kent Modified Paths: -- trunk/blender/extern/ffmpeg/libavcodec/eval.c Modified: trunk/blender/extern/ffmpeg/libavcodec/eval.c === --- trunk/blender/extern/ffmpeg/libavcodec/eval.c 2009-05-28 02:03:48 UTC (rev 20460) +++ trunk/blender/extern/ffmpeg/libavcodec/eval.c 2009-05-28 02:12:28 UTC (rev 20461) @@ -36,7 +36,8 @@ #include string.h #include math.h -#ifndef NAN +#if !defined(NAN) || defined(__sun__) + #undef NAN #define NAN 0.0/0.0 #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 [20105] branches/blender2.5/blender/source /gameengine/BlenderRoutines: Added include dir for blenfont
Revision: 20105 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20105 Author: sirdude Date: 2009-05-08 16:05:17 +0200 (Fri, 08 May 2009) Log Message: --- Added include dir for blenfont Kent Modified Paths: -- branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt === --- branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2009-05-08 12:51:36 UTC (rev 20104) +++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2009-05-08 14:05:17 UTC (rev 20105) @@ -14,6 +14,7 @@ ../../../source/gameengine/Ketsji ../../../source/blender/blenlib ../../../source/blender/blenkernel + ../../../source/blender/blenfont ../../../source/blender/editors/include ../../../source/blender/windowmanager ../../../source/blender Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript === --- branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript 2009-05-08 12:51:36 UTC (rev 20104) +++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript 2009-05-08 14:05:17 UTC (rev 20105) @@ -9,7 +9,8 @@ incs += ' #source/gameengine/Converter #source/blender/imbuf' incs += ' #intern/ghost/include' incs += ' #intern/moto/include #source/gameengine/Ketsji #source/blender/blenlib' -incs += ' #source/blender/blenkernel #source/blender #source/blender/editors/include' +incs += ' #source/blender/blenkernel #source/blender' +incs += ' #source/blender/blenfont #source/blender/editors/include' incs += ' #source/blender/makesdna #source/gameengine/Rasterizer #source/gameengine/GameLogic' incs += ' #source/gameengine/Expressions #source/gameengine/Network' incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common' ___ 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 [20102] branches/blender2.5/blender: Tweaks to build systems.
Revision: 20102 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20102 Author: sirdude Date: 2009-05-08 05:49:48 +0200 (Fri, 08 May 2009) Log Message: --- Tweaks to build systems. Just some small cleanups... Kent Modified Paths: -- branches/blender2.5/blender/extern/CMakeLists.txt branches/blender2.5/blender/extern/Makefile branches/blender2.5/blender/extern/SConscript branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile Modified: branches/blender2.5/blender/extern/CMakeLists.txt === --- branches/blender2.5/blender/extern/CMakeLists.txt 2009-05-07 22:31:19 UTC (rev 20101) +++ branches/blender2.5/blender/extern/CMakeLists.txt 2009-05-08 03:49:48 UTC (rev 20102) @@ -32,14 +32,6 @@ SUBDIRS(bullet2) ENDIF(WITH_BULLET) -IF(WITH_INTERNATIONAL) - SUBDIRS(bFTGL) -ENDIF(WITH_INTERNATIONAL) - -IF(WITH_VERSE) - SUBDIRS(verse) -ENDIF(WITH_VERSE) - IF(CMAKE_SYSTEM_NAME MATCHES Linux) SUBDIRS(binreloc) ENDIF(CMAKE_SYSTEM_NAME MATCHES Linux) Modified: branches/blender2.5/blender/extern/Makefile === --- branches/blender2.5/blender/extern/Makefile 2009-05-07 22:31:19 UTC (rev 20101) +++ branches/blender2.5/blender/extern/Makefile 2009-05-08 03:49:48 UTC (rev 20102) @@ -41,10 +41,6 @@ endif endif -ifeq ($(WITH_VERSE), true) - DIRS += verse -endif - ifneq ($(NAN_NO_KETSJI), true) DIRS += bullet2 endif Modified: branches/blender2.5/blender/extern/SConscript === --- branches/blender2.5/blender/extern/SConscript 2009-05-07 22:31:19 UTC (rev 20101) +++ branches/blender2.5/blender/extern/SConscript 2009-05-08 03:49:48 UTC (rev 20102) @@ -11,9 +11,6 @@ if env['WITH_BF_BULLET']: SConscript(['bullet2/src/SConscript']) -if env['WITH_BF_INTERNATIONAL']: -SConscript(['bFTGL/SConscript']) - if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '': SConscript(['x264/SConscript']) SConscript(['libmp3lame/SConscript']) Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp === --- branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp 2009-05-07 22:31:19 UTC (rev 20101) +++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp 2009-05-08 03:49:48 UTC (rev 20102) @@ -27,6 +27,7 @@ */ #include KX_BlenderGL.h +#include BLF_api.h #ifdef HAVE_CONFIG_H #include config.h Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile === --- branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile 2009-05-07 22:31:19 UTC (rev 20101) +++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile 2009-05-08 03:49:48 UTC (rev 20102) @@ -54,7 +54,7 @@ CPPFLAGS += -I../../blender/blenkernel CPPFLAGS += -I../../blender/render/extern/include CPPFLAGS += -I../../blender/blenloader -CPPFLAGS += -I../../blender/blenkernel +CPPFLAGS += -I../../blender/blenfont CPPFLAGS += -I../../blender/gpu CPPFLAGS += -I../Converter CPPFLAGS += -I../Expressions ___ 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 [20018] trunk/blender/source/Makefile: Fix linking issue with gameplayer.
Revision: 20018 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=20018 Author: sirdude Date: 2009-05-01 17:19:47 +0200 (Fri, 01 May 2009) Log Message: --- Fix linking issue with gameplayer. Kent Modified Paths: -- trunk/blender/source/Makefile Modified: trunk/blender/source/Makefile === --- trunk/blender/source/Makefile 2009-05-01 14:19:56 UTC (rev 20017) +++ trunk/blender/source/Makefile 2009-05-01 15:19:47 UTC (rev 20018) @@ -261,6 +261,7 @@ # can I just not check them? nm claims they aren't... SPLIB += $(OCGDIR)/blender/blenkernel/blenkernel_blc/$(DEBUG_DIR)libblenkernel_blc.a SPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a +SPLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a # These three need to be explicitly mentioned on the cl, because # if they are offered as a lib, they are optimized away. (nzc) ___ 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 [19739] trunk/blender/source/blender: Fixing more errors coverity found.
Revision: 19739
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19739
Author: sirdude
Date: 2009-04-15 18:16:00 +0200 (Wed, 15 Apr 2009)
Log Message:
---
Fixing more errors coverity found.
Imagepaint make sure ibuf exists before we use it. This is CID# 545
editmesh_tools.c make sure were not indexing array with -1 This is CID# 137
(also removed some trailing whitespace I found)
anim5.c totlen could be -1 so check its -1 This is CID# 134
Kent
Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/anim5.c
trunk/blender/source/blender/src/editmesh_tools.c
trunk/blender/source/blender/src/imagepaint.c
Modified: trunk/blender/source/blender/imbuf/intern/anim5.c
===
--- trunk/blender/source/blender/imbuf/intern/anim5.c 2009-04-15 15:40:31 UTC
(rev 19738)
+++ trunk/blender/source/blender/imbuf/intern/anim5.c 2009-04-15 16:16:00 UTC
(rev 19739)
@@ -425,7 +425,7 @@
/* de hele file wordt in het geheugen gemapped */
totlen = BLI_filesize(file);
- if (totlen file=0) {
+ if (totlen0 file=0) {
lseek(file, 0L, SEEK_SET);
mem= MEM_mallocN(totlen, mmap);
Modified: trunk/blender/source/blender/src/editmesh_tools.c
===
--- trunk/blender/source/blender/src/editmesh_tools.c 2009-04-15 15:40:31 UTC
(rev 19738)
+++ trunk/blender/source/blender/src/editmesh_tools.c 2009-04-15 16:16:00 UTC
(rev 19739)
@@ -2520,11 +2520,13 @@
}
}
}
- sort[hold]-f = ~SELECT;
- sort[hold]-f2 |= EDGENEW;
- length[hold] = -1;
- }
- }
+ if (hold -1) {
+ sort[hold]-f =
~SELECT;
+ sort[hold]-f2 |=
EDGENEW;
+ length[hold] = -1;
+ }
+ }
+ }
// Beauty Long Edges
else {
@@ -2541,13 +2543,15 @@
}
}
}
- sort[hold]-f = ~SELECT;
- sort[hold]-f2 |= EDGENEW;
- length[hold] = -1;
- }
- }
+ if (hold -1) {
+ sort[hold]-f =
~SELECT;
+ sort[hold]-f2 |=
EDGENEW;
+ length[hold] = -1;
+ }
+ }
+ }
}
- }
+ }
}
gh = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
Modified: trunk/blender/source/blender/src/imagepaint.c
===
--- trunk/blender/source/blender/src/imagepaint.c 2009-04-15 15:40:31 UTC
(rev 19738)
+++ trunk/blender/source/blender/src/imagepaint.c 2009-04-15 16:16:00 UTC
(rev 19739)
@@ -708,9 +708,8 @@
}
ibuf = BKE_image_get_ibuf((Image *)tf-tpage, NULL); /* TODO - this may
be slow, the only way around it is to have an ibuf index per face */
+ if (!ibuf) return 0;
-
-
if (interp) {
float x, y;
uvco_to_wrapped_pxco(uv, ibuf-x, ibuf-y, x, y);
___
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 [19740] trunk/blender: This is patch [ #18408] Build issues with make on Cygwin hosted MinGW (2.48.1)
Revision: 19740
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19740
Author: sirdude
Date: 2009-04-15 18:23:13 +0200 (Wed, 15 Apr 2009)
Log Message:
---
This is patch [#18408] Build issues with make on Cygwin hosted MinGW (2.48.1)
submitted by Wayne Dennis
adds an include, changes pythonlib and does a little cleaning of dlltool stuff.
Kent
Modified Paths:
--
trunk/blender/dlltool/Makefile
trunk/blender/source/gameengine/GamePlayer/common/windows/Makefile
trunk/blender/source/nan_definitions.mk
Modified: trunk/blender/dlltool/Makefile
===
--- trunk/blender/dlltool/Makefile 2009-04-15 16:16:00 UTC (rev 19739)
+++ trunk/blender/dlltool/Makefile 2009-04-15 16:23:13 UTC (rev 19740)
@@ -1,7 +1,5 @@
include nan_definitions.mk
-PYTHONDLL=python$(subst .,,$(NAN_PYTHON_VERSION)).dll
-
all: ${NAN_GETTEXT}/lib/freegettext.a ${NAN_ICONV}/lib/freeiconv.a \
${NAN_PYTHON}/lib/freepy.a
@@ -24,15 +22,6 @@
ranlib ${NAN_ICONV}/lib/freeiconv.a
rm ./iconv.dll
-${NAN_PYTHON}/lib/freepy.a: python.def ${NAN_PYTHON}/lib/$(PYTHONDLL)
- cp ${NAN_PYTHON}/lib/$(PYTHONDLL) .
- sed s/PYTHON22\.DLL/$(PYTHONDLL)/ python.def $(PYTHONDLL).def
- dlltool.exe -v --output-lib ${NAN_PYTHON}/lib/freepy.a \
- --input-def $(PYTHONDLL).def \
- --dllname $(PYTHONDLL)
- ranlib ${NAN_PYTHON}/lib/freepy.a
- rm ./$(PYTHONDLL)
-
clean:
- $(RM) ${NAN_PYTHON}/lib/freepy.a ${NAN_GETTEXT}/lib/freegettext.a \
+ $(RM) ${NAN_GETTEXT}/lib/freegettext.a \
${NAN_ICONV}/lib/freeiconv.a
Modified: trunk/blender/source/gameengine/GamePlayer/common/windows/Makefile
===
--- trunk/blender/source/gameengine/GamePlayer/common/windows/Makefile
2009-04-15 16:16:00 UTC (rev 19739)
+++ trunk/blender/source/gameengine/GamePlayer/common/windows/Makefile
2009-04-15 16:23:13 UTC (rev 19740)
@@ -50,6 +50,7 @@
CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_BMFONT)/include
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
+CPPFLAGS += -I$(NAN_GLEW)/include
# Blender stuff
CPPFLAGS += -I$(SRCHOME)/blender/blenkernel
Modified: trunk/blender/source/nan_definitions.mk
===
--- trunk/blender/source/nan_definitions.mk 2009-04-15 16:16:00 UTC (rev
19739)
+++ trunk/blender/source/nan_definitions.mk 2009-04-15 16:23:13 UTC (rev
19740)
@@ -516,7 +516,7 @@
ifeq ($(FREE_WINDOWS), true)
export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib/freegettext.a
$(NAN_ICONV)/lib/freeiconv.a
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
- export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/freepy.a
+ export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/lib25_vs2005/libpython25.a
export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype
export NAN_ODE ?= $(LCGDIR)/gcc/ode
export NAN_SDL ?= $(LCGDIR)/gcc/sdl
___
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 [19555] trunk/blender/source/blender/ python/api2_2x/bpy_internal_import.c: cast needed to get things compiling again on my machine.
Revision: 19555
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19555
Author: sirdude
Date: 2009-04-06 03:43:01 +0200 (Mon, 06 Apr 2009)
Log Message:
---
cast needed to get things compiling again on my machine.
Kent
Modified Paths:
--
trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c
Modified: trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c
===
--- trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c
2009-04-06 00:43:59 UTC (rev 19554)
+++ trunk/blender/source/blender/python/api2_2x/bpy_internal_import.c
2009-04-06 01:43:01 UTC (rev 19555)
@@ -40,7 +40,7 @@
static void free_compiled_text(Text *text)
{
if(text-compiled) {
- Py_DECREF(text-compiled);
+ Py_DECREF(( PyObject * )text-compiled);
}
text-compiled= NULL;
}
___
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 [19425] trunk/blender/source/blender/ blenkernel/intern/anim.c: Fixed a couple of null issues spotted by coverity .
Revision: 19425
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19425
Author: sirdude
Date: 2009-03-27 17:27:48 +0100 (Fri, 27 Mar 2009)
Log Message:
---
Fixed a couple of null issues spotted by coverity.
CIDS: 42 and 470
Kent
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/anim.c
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2009-03-27
06:42:36 UTC (rev 19424)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2009-03-27
16:27:48 UTC (rev 19425)
@@ -223,14 +223,16 @@
cu= ob-data;
if(cu-path==NULL || cu-path-data==NULL) {
printf(no path!\n);
+ return 0;
}
path= cu-path;
fp= path-data;
/* test for cyclic */
bl= cu-bev.first;
+ if (!bl) return 0;
if (!bl-nr) return 0;
- if(bl bl-poly -1) cycl= 1;
+ if(bl-poly -1) cycl= 1;
ctime *= (path-len-1);
___
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 [19402] trunk/blender/source/blender: Changed missing line ending style for TEX_ files
Revision: 19402 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19402 Author: sirdude Date: 2009-03-24 20:39:02 +0100 (Tue, 24 Mar 2009) Log Message: --- Changed missing line ending style for TEX_ files in sculptmode.c move initalization of a var to fix an issue where index of array could be -1. Found by coverity. Kent Modified Paths: -- trunk/blender/source/blender/nodes/TEX_node.h trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c trunk/blender/source/blender/src/sculptmode.c Property Changed: trunk/blender/source/blender/nodes/TEX_node.h trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c Modified: trunk/blender/source/blender/nodes/TEX_node.h === --- trunk/blender/source/blender/nodes/TEX_node.h 2009-03-24 19:37:17 UTC (rev 19401) +++ trunk/blender/source/blender/nodes/TEX_node.h 2009-03-24 19:39:02 UTC (rev 19402) @@ -1,77 +1,77 @@ -/** - * $Id: CMP_node.h 12429 2007-10-29 14:37:19Z bebraw $ - * - * * 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. The Blender - * Foundation also sells licenses for use in proprietary software under - * the Blender License. See http://www.blender.org/BL/ for information - * about this. - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2005 Blender Foundation. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * * END GPL LICENSE BLOCK * - */ - -#ifndef TEX_NODE_H -#define TEX_NODE_H - -#include BKE_node.h - - -/* ** types array for all texture nodes ** */ - -extern bNodeType tex_node_math; -extern bNodeType tex_node_mix_rgb; -extern bNodeType tex_node_valtorgb; -extern bNodeType tex_node_valtonor; -extern bNodeType tex_node_rgbtobw; -extern bNodeType tex_node_output; -extern bNodeType tex_node_viewer; -extern bNodeType tex_node_checker; -extern bNodeType tex_node_texture; -extern bNodeType tex_node_bricks; -extern bNodeType tex_node_image; -extern bNodeType tex_node_curve_rgb; -extern bNodeType tex_node_curve_time; -extern bNodeType tex_node_invert; -extern bNodeType tex_node_hue_sat; -extern bNodeType tex_node_coord; -extern bNodeType tex_node_distance; - -extern bNodeType tex_node_rotate; -extern bNodeType tex_node_translate; -extern bNodeType tex_node_scale; - -extern bNodeType tex_node_compose; -extern bNodeType tex_node_decompose; - -extern bNodeType tex_node_proc_voronoi; -extern bNodeType tex_node_proc_blend; -extern bNodeType tex_node_proc_magic; -extern bNodeType tex_node_proc_marble; -extern bNodeType tex_node_proc_clouds; -extern bNodeType tex_node_proc_wood; -extern bNodeType tex_node_proc_musgrave; -extern bNodeType tex_node_proc_noise; -extern bNodeType tex_node_proc_stucci; -extern bNodeType tex_node_proc_distnoise; - -#endif +/** + * $Id: CMP_node.h 12429 2007-10-29 14:37:19Z bebraw $ + * + * * 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. The Blender + * Foundation also sells licenses for use in proprietary software under + * the Blender License. See http://www.blender.org/BL/ for information + * about this. + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2005 Blender Foundation. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * * END GPL LICENSE BLOCK * + */ + +#ifndef TEX_NODE_H +#define TEX_NODE_H + +#include BKE_node.h + + +/* ** types
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19387] trunk/blender/extern/ffmpeg/subdir .mak: Added some missing dirs that need to be created for
Revision: 19387 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19387 Author: sirdude Date: 2009-03-23 19:11:10 +0100 (Mon, 23 Mar 2009) Log Message: --- Added some missing dirs that need to be created for building to work. Kent Modified Paths: -- trunk/blender/extern/ffmpeg/subdir.mak Modified: trunk/blender/extern/ffmpeg/subdir.mak === --- trunk/blender/extern/ffmpeg/subdir.mak 2009-03-23 17:52:07 UTC (rev 19386) +++ trunk/blender/extern/ffmpeg/subdir.mak 2009-03-23 18:11:10 UTC (rev 19387) @@ -33,7 +33,7 @@ SRC_DIR = $(SRC_PATH)/lib$(NAME) DIR = $(OCGDIR)/extern/ffmpeg/lib$(NAME) VPATH = $(SRC_DIR) -EXTRADIRS = alpha armv4l i386 liba52 mlib ppc ps2 sh4 sparc bfin +EXTRADIRS = alpha armv4l i386 liba52 mlib ppc ps2 sh4 sparc bfin x86 arm CFLAGS += $(CFLAGS-yes) OBJS += $(OBJS-yes) ___ 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 [19388] trunk/blender/source/creator/ Makefile: Another patch by GSR
Revision: 19388 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19388 Author: sirdude Date: 2009-03-23 19:11:46 +0100 (Mon, 23 Mar 2009) Log Message: --- Another patch by GSR Just some minor cleanups. Kent Modified Paths: -- trunk/blender/source/creator/Makefile Modified: trunk/blender/source/creator/Makefile === --- trunk/blender/source/creator/Makefile 2009-03-23 18:11:10 UTC (rev 19387) +++ trunk/blender/source/creator/Makefile 2009-03-23 18:11:46 UTC (rev 19388) @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # * END GPL LICENSE BLOCK * # @@ -43,6 +45,7 @@ # two needed for the kernel CPPFLAGS += -I../blender/imbuf CPPFLAGS += -I../blender/makesdna +CPPFLAGS += -I../blender/makesrna CPPFLAGS += -I../blender/blenlib CPPFLAGS += -I../blender/include CPPFLAGS += -I../blender/renderconverter @@ -56,14 +59,14 @@ CPPFLAGS += -I$(NAN_GLEW)/include ifeq ($(WITH_QUICKTIME), true) - CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME + CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME endif ifeq ($(WITH_OPENJPEG), true) - CPPFLAGS += -DWITH_OPENJPEG + CPPFLAGS += -DWITH_OPENJPEG endif ifeq ($(WITH_BINRELOC), true) - CPPFLAGS += -I$(NANBLENDERHOME)/extern/binreloc/include -DWITH_BINRELOC + CPPFLAGS += -I$(NANBLENDERHOME)/extern/binreloc/include -DWITH_BINRELOC endif CPPFLAGS += -I$(OPENGL_HEADERS) ___ 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 [19389] trunk/blender/source: Added BF_PROFILE (same name as in scons files) option.
Revision: 19389 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19389 Author: sirdude Date: 2009-03-23 20:52:49 +0100 (Mon, 23 Mar 2009) Log Message: --- Added BF_PROFILE (same name as in scons files) option. Set it to true to build with -pg Also I added CCFLAGS to final link of targets. Not sure why it wasn't there before. Kent Modified Paths: -- trunk/blender/source/Makefile trunk/blender/source/nan_compile.mk trunk/blender/source/nan_definitions.mk Modified: trunk/blender/source/Makefile === --- trunk/blender/source/Makefile 2009-03-23 18:11:46 UTC (rev 19388) +++ trunk/blender/source/Makefile 2009-03-23 19:52:49 UTC (rev 19389) @@ -520,7 +520,7 @@ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='$(BUILD_DATE)' -DBUILD_TIME='$(BUILD_TIME)' -DBUILD_REV='$(BUILD_REV)' -DBUILD_PLATFORM='$(CONFIG_GUESS)' -DBUILD_TYPE='static' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO endif mkdir -p $(DIR)/$(DEBUG_DIR)bin - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(SADD) $(LOPTS) + $(CCC) $(CCFLAGS) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(SADD) $(LOPTS) ifdef NAN_BUILDINFO /bin/rm $(BUILDINFO_O) endif @@ -534,7 +534,7 @@ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='$(BUILD_DATE)' -DBUILD_TIME='$(BUILD_TIME)' -DBUILD_REV='$(BUILD_REV)' -DBUILD_PLATFORM='$(CONFIG_GUESS)' -DBUILD_TYPE='dynamic' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO endif mkdir -p $(DIR)/$(DEBUG_DIR)bin - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blender$(EXT) $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(DADD) $(LOPTS) + $(CCC) $(CCFLAGS) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blender$(EXT) $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(DADD) $(LOPTS) ifdef NAN_BUILDINFO /bin/rm $(BUILDINFO_O) endif @@ -548,7 +548,7 @@ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='$(BUILD_DATE)' -DBUILD_TIME='$(BUILD_TIME)' -DBUILD_REV='$(BUILD_REV)' -DBUILD_PLATFORM='$(CONFIG_GUESS)' -DBUILD_TYPE='dynamic' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO endif mkdir -p $(DIR)/$(DEBUG_DIR)bin - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(LLIBS) $(DADD) $(LOPTS) + $(CCC) $(CCFLAGS) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(LLIBS) $(DADD) $(LOPTS) ifdef NAN_BUILDINFO /bin/rm $(BUILDINFO_O) endif @@ -562,7 +562,7 @@ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='$(BUILD_DATE)' -DBUILD_TIME='$(BUILD_TIME)' -DBUILD_REV='$(BUILD_REV)' -DBUILD_PLATFORM='$(CONFIG_GUESS)' -DBUILD_TYPE='dynamic' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO endif mkdir -p $(DIR)/$(DEBUG_DIR)bin - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderdynplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(LLIBS) $(DADD) $(LOPTS) + $(CCC) $(CCFLAGS) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderdynplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(LLIBS) $(DADD) $(LOPTS) ifdef NAN_BUILDINFO /bin/rm $(BUILDINFO_O) endif @@ -576,7 +576,7 @@ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='$(BUILD_DATE)' -DBUILD_TIME='$(BUILD_TIME)' -DBUILD_REV='$(BUILD_REV)' -DBUILD_PLATFORM='$(CONFIG_GUESS)' -DBUILD_TYPE='dynamic' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO endif mkdir -p $(DIR)/$(DEBUG_DIR)bin - $(CCC) $(DYNLDFLAGS) -o $@ $(PLUGAPPLIB_XPLINK) $(LOPTS) + $(CCC) $(CCFLAGS) $(DYNLDFLAGS) -o $@ $(PLUGAPPLIB_XPLINK) $(LOPTS) ifdef NAN_BUILDINFO /bin/rm $(BUILDINFO_O) endif Modified: trunk/blender/source/nan_compile.mk === --- trunk/blender/source/nan_compile.mk 2009-03-23 18:11:46 UTC (rev 19388) +++ trunk/blender/source/nan_compile.mk 2009-03-23 19:52:49 UTC (rev 19389) @@ -47,6 +47,11 @@ CPPFLAGS += -DNO_KETSJI endif +ifeq ($(BF_PROFILE), true) +CFLAGS += -pg +CCFLAGS += -pg +endif + ifeq ($(WITH_BF_OPENMP), true) CFLAGS += -fopenmp CCFLAGS += -fopenmp Modified: trunk/blender/source/nan_definitions.mk === --- trunk/blender/source/nan_definitions.mk 2009-03-23 18:11:46 UTC (rev 19388) +++ trunk/blender/source/nan_definitions.mk 2009-03-23 19:52:49 UTC (rev 19389) @@ -75,6 +75,7 @@ export NAN_SOLID ?= $(LCGDIR)/solid export NAN_QHULL ?= $(LCGDIR)/qhull endif +export BF_PROFILE ?= false export NAN_USE_BULLET ?= true export NAN_BULLET2 ?= $(LCGDIR)/bullet2 export NAN_SUMO ?=
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19315] branches/blender2.5/blender: Patch by gsr: [#18411] Improved makefiles for translation files
Revision: 19315 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19315 Author: sirdude Date: 2009-03-16 17:35:29 +0100 (Mon, 16 Mar 2009) Log Message: --- Patch by gsr: [#18411] Improved makefiles for translation files Makes it so it uses wildcards instead of hardcoding the po files and also only builds files if missing/changed. Kent Modified Paths: -- branches/blender2.5/blender/Makefile branches/blender2.5/blender/po/Makefile Modified: branches/blender2.5/blender/Makefile === --- branches/blender2.5/blender/Makefile2009-03-16 15:54:43 UTC (rev 19314) +++ branches/blender2.5/blender/Makefile2009-03-16 16:35:29 UTC (rev 19315) @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # $Id$ # # * BEGIN GPL LICENSE BLOCK * @@ -31,12 +33,11 @@ # If the user wants to override some of the build # vars they can put it in the file user-def.mk which # will get included if it exists (please do not commit -# user-def.mk to cvs). - +# user-def.mk to the revision control server). sinclude user-def.mk -# To build without openAL, uncomment the following line, or set it as -# an environment variable, or put it uncommented in user-def.mk: +# To build without openAL, set it as an environment variable, +# or put it uncommented in user-def.mk: # export NAN_NO_OPENAL=true export NANBLENDERHOME=$(shell pwd) @@ -44,15 +45,11 @@ SOURCEDIR = ifeq ($(FREE_WINDOWS),true) -DIRS ?= dlltool extern intern source +DIRS ?= dlltool extern intern source po +else +DIRS ?= extern intern source po endif -DIRS ?= extern intern source - -ifneq ($(INTERNATIONAL),false) -DIRS += po -endif - include source/nan_subdirs.mk .PHONY: release Modified: branches/blender2.5/blender/po/Makefile === --- branches/blender2.5/blender/po/Makefile 2009-03-16 15:54:43 UTC (rev 19314) +++ branches/blender2.5/blender/po/Makefile 2009-03-16 16:35:29 UTC (rev 19315) @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # $Id$ # # * BEGIN GPL LICENSE BLOCK * @@ -9,47 +11,48 @@ # # 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 +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # The Original Code is Copyright (C) 2002 by Stichting Blender Foundation, # Amsterdam, the Netherlands. # All rights reserved. # -# The Original Code is: revision 1.1 +# The Original Code is: revision 1.2 # -# Contributor(s): Wouter van Heyst +# Contributor(s): Wouter van Heyst, GSR # # * END GPL LICENSE BLOCK * # -# po Makefile for blender. Compiles the translations and places them +# po Makefile for blender. Compiles the translations in the place # where release can pick them up. +PO_FILES = $(wildcard *.po) + +LINGUAS = $(basename $(PO_FILES)) + SOURCEDIR = blender/po include nan_definitions.mk -LINGUAS = ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr s...@latn sv uk zh_CN - ifeq ($(OS), darwin) -DIR = $(OCGDIR)/bin/blender.app/Contents/Resources/locale/$@/LC_MESSAGES/ + DIR = $(OCGDIR)/bin/blender.app/Contents/Resources/locale/ else -DIR = $(OCGDIR)/bin/.blender/locale/$@/LC_MESSAGES/ + DIR = $(OCGDIR)/bin/.blender/locale/ endif -all debug:: $(LINGUAS) +LINGUAS_DEST= $(foreach LINGUA, $(LINGUAS),$(DIR)$(LINGUA)/LC_MESSAGES/blender.mo) +$(DIR)%/LC_MESSAGES/blender.mo: %.po + mkdir -p $(@D) + msgfmt -o $@ $ + +all debug:: $(LINGUAS_DEST) +# Just trigger the deps + clean:: -ifeq ($(OS), darwin) - rm -rf $(OCGDIR)/bin/blender.app/Contents/Resources/locale/ -else - rm -rf $(OCGDIR)/bin/.blender/locale/ -endif - -$(LINGUAS): - mkdir -p $(DIR) - msgfmt -o $(DIR)/blender.mo $...@.po + rm -rf $(DIR) ___ 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 [19316] trunk/blender: This is patch:
Revision: 19316 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19316 Author: sirdude Date: 2009-03-16 18:02:19 +0100 (Mon, 16 Mar 2009) Log Message: --- This is patch: [#17974] two small fix for blender 2.48 (memory leak and uninitalized vars) Submitted By: Pavel Nemec (nemecp) (changes delete to [] and sets to vars to NULL) Kent Modified Paths: -- trunk/blender/intern/opennl/superlu/get_perm_c.c trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp Modified: trunk/blender/intern/opennl/superlu/get_perm_c.c === --- trunk/blender/intern/opennl/superlu/get_perm_c.c2009-03-16 16:35:29 UTC (rev 19315) +++ trunk/blender/intern/opennl/superlu/get_perm_c.c2009-03-16 17:02:19 UTC (rev 19316) @@ -366,6 +366,10 @@ int *b_rowind, *dhead, *qsize, *llist, *marker; double t, SuperLU_timer_(); +/* make gcc happy */ +b_rowind=NULL; +b_colptr=NULL; + m = A-nrow; n = A-ncol; Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp === --- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 2009-03-16 16:35:29 UTC (rev 19315) +++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 2009-03-16 17:02:19 UTC (rev 19316) @@ -246,7 +246,7 @@ if (BLI_exists(gamefile)) BLI_strncpy(filename, gamefile, FILE_MAXDIR + FILE_MAXFILE); - delete gamefile; + delete [] gamefile; } #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 [19245] trunk/blender: Addes libopenjpeg ( jpeg2000) support to the Makefiles
Revision: 19245 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19245 Author: sirdude Date: 2009-03-10 17:04:29 +0100 (Tue, 10 Mar 2009) Log Message: --- Addes libopenjpeg (jpeg2000) support to the Makefiles Kent Modified Paths: -- trunk/blender/extern/Makefile trunk/blender/source/Makefile trunk/blender/source/blender/blenkernel/intern/Makefile trunk/blender/source/blender/imbuf/intern/Makefile trunk/blender/source/blender/src/Makefile trunk/blender/source/creator/Makefile trunk/blender/source/nan_definitions.mk Added Paths: --- trunk/blender/extern/libopenjpeg/Makefile Modified: trunk/blender/extern/Makefile === --- trunk/blender/extern/Makefile 2009-03-10 08:54:35 UTC (rev 19244) +++ trunk/blender/extern/Makefile 2009-03-10 16:04:29 UTC (rev 19245) @@ -57,6 +57,10 @@ DIRS += binreloc endif +ifeq ($(WITH_OPENJPEG), true) +DIRS += libopenjpeg +endif + TARGET = solid all:: Added: trunk/blender/extern/libopenjpeg/Makefile === --- trunk/blender/extern/libopenjpeg/Makefile (rev 0) +++ trunk/blender/extern/libopenjpeg/Makefile 2009-03-10 16:04:29 UTC (rev 19245) @@ -0,0 +1,43 @@ +# +# $Id: Makefile 1 2008-04-16 22:40:48Z hos $ +# +# * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 * +# +# + +LIBNAME = openjpeg +DIR = $(OCGDIR)/extern/$(LIBNAME) + +CCFLAGS += $(LEVEL_1_CPP_WARNINGS) + +TCSRCS = $(wildcard *.c) +CSRCS = $(filter-out t1_generate_luts.c,$(TCSRCS)) + +include nan_compile.mk +CPPFLAGS += -I. + +install: all debug + Modified: trunk/blender/source/Makefile === --- trunk/blender/source/Makefile 2009-03-10 08:54:35 UTC (rev 19244) +++ trunk/blender/source/Makefile 2009-03-10 16:04:29 UTC (rev 19245) @@ -171,6 +171,10 @@ COMLIB += $(OCGDIR)/blender/imbuf/openexr/$(DEBUG_DIR)libopenexr.a endif +ifeq ($(WITH_OPENJPEG), true) +COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a +endif + COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a ifeq ($(WITH_DDS), true) Modified: trunk/blender/source/blender/blenkernel/intern/Makefile === --- trunk/blender/source/blender/blenkernel/intern/Makefile 2009-03-10 08:54:35 UTC (rev 19244) +++ trunk/blender/source/blender/blenkernel/intern/Makefile 2009-03-10 16:04:29 UTC (rev 19245) @@ -108,6 +108,10 @@ CPPFLAGS += -DWITH_DDS endif +ifeq ($(WITH_OPENJPEG), true) +CPPFLAGS += -DWITH_OPENJPEG +endif + ifeq ($(WITH_QUICKTIME), true) CPPFLAGS += -I../../quicktime CPPFLAGS += -DWITH_QUICKTIME Modified: trunk/blender/source/blender/imbuf/intern/Makefile === --- trunk/blender/source/blender/imbuf/intern/Makefile 2009-03-10 08:54:35 UTC (rev 19244) +++ trunk/blender/source/blender/imbuf/intern/Makefile 2009-03-10 16:04:29 UTC (rev 19245) @@ -48,6 +48,10 @@ CPPFLAGS += -DWITH_DDS endif +ifeq ($(WITH_OPENJPEG), true) +CFLAGS += -DWITH_OPENJPEG -I../../../../extern/libopenjpeg +endif + CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_JPEG)/include Modified: trunk/blender/source/blender/src/Makefile === --- trunk/blender/source/blender/src/Makefile 2009-03-10 08:54:35 UTC (rev 19244) +++ trunk/blender/source/blender/src/Makefile 2009-03-10 16:04:29 UTC (rev 19245) @@ -127,6 +127,10 @@ CPPFLAGS += -DWITH_DDS endif +ifeq ($(WITH_OPENJPEG),true) + CPPFLAGS += -DWITH_OPENJPEG +endif + ifeq ($(INTERNATIONAL), true) CPPFLAGS += -DINTERNATIONAL endif Modified: trunk/blender/source/creator/Makefile === ---
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19254] trunk/blender/source/blender/src/ view.c: removed extra space in text.
Revision: 19254
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19254
Author: sirdude
Date: 2009-03-11 03:58:18 +0100 (Wed, 11 Mar 2009)
Log Message:
---
removed extra space in text.
Kent
Modified Paths:
--
trunk/blender/source/blender/src/view.c
Modified: trunk/blender/source/blender/src/view.c
===
--- trunk/blender/source/blender/src/view.c 2009-03-11 00:52:00 UTC (rev
19253)
+++ trunk/blender/source/blender/src/view.c 2009-03-11 02:58:18 UTC (rev
19254)
@@ -2030,7 +2030,7 @@
locallay= free_localbit();
if(locallay==0) {
- error(Sorry, no more than 8 localviews);
+ error(Sorry, no more than 8 localviews);
ok= 0;
}
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 [19211] trunk/blender: Addes jpeg2000 support to cmake.
Revision: 19211
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19211
Author: sirdude
Date: 2009-03-06 16:46:13 +0100 (Fri, 06 Mar 2009)
Log Message:
---
Addes jpeg2000 support to cmake.
I also did some small tweaks. removed ifdef's for pluginapi
didn't need them there.
Fixed it so the filesel shows jp2 as image files.
(I'm going to do makefiles next)
Kent
Modified Paths:
--
trunk/blender/CMakeLists.txt
trunk/blender/blenderplayer/CMakeLists.txt
trunk/blender/extern/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenpluginapi/iff.h
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/src/CMakeLists.txt
trunk/blender/source/blender/src/filesel.c
trunk/blender/source/creator/CMakeLists.txt
Added Paths:
---
trunk/blender/extern/libopenjpeg/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===
--- trunk/blender/CMakeLists.txt2009-03-06 14:58:37 UTC (rev 19210)
+++ trunk/blender/CMakeLists.txt2009-03-06 15:46:13 UTC (rev 19211)
@@ -63,7 +63,7 @@
OPTION(WITH_OPENEXREnable OpenEXR Support
(http://www.openexr.com) ON)
OPTION(WITH_DDSEnable DDS Support
ON)
OPTION(WITH_FFMPEG Enable FFMPeg Support
(http://ffmpeg.mplayerhq.hu/) OFF)
-OPTION(WITH_FFMPEG Enable FFMPeg Support
(http://ffmpeg.mplayerhq.hu/) OFF)
+OPTION(WITH_OPENJPEG Enable OpenJpeg Support
(http://www.openjpeg.org/)OFF)
OPTION(WITH_OPENAL Enable OpenAL Support (http://www.openal.org)
ON)
OPTION(WITH_OPENMP Enable OpenMP (has to be supported by the
compiler) OFF)
OPTION(WITH_WEBPLUGIN Enable Web Plugin (Unix only)
OFF)
@@ -431,6 +431,9 @@
SET(FTGL_INC ${FTGL}/include)
SET(FTGL_LIB extern_ftgl)
+set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
+set(OPENJPEG_INC ${OPENJPEG})
+set(OPENJPEG_LIb extern_libopenjpeg)
#-
# Blender WebPlugin
Modified: trunk/blender/blenderplayer/CMakeLists.txt
===
--- trunk/blender/blenderplayer/CMakeLists.txt 2009-03-06 14:58:37 UTC (rev
19210)
+++ trunk/blender/blenderplayer/CMakeLists.txt 2009-03-06 15:46:13 UTC (rev
19211)
@@ -104,6 +104,7 @@
bf_blenlib
bf_cineon
bf_openexr
+extern_libopenjpeg
bf_dds
bf_ftfont
extern_ftgl
Modified: trunk/blender/extern/CMakeLists.txt
===
--- trunk/blender/extern/CMakeLists.txt 2009-03-06 14:58:37 UTC (rev 19210)
+++ trunk/blender/extern/CMakeLists.txt 2009-03-06 15:46:13 UTC (rev 19211)
@@ -29,7 +29,7 @@
ENDIF(WITH_GAMEENGINE)
IF(WITH_BULLET)
-SUBDIRS(bullet2)
+ SUBDIRS(bullet2)
ENDIF(WITH_BULLET)
IF(WITH_INTERNATIONAL)
@@ -46,3 +46,6 @@
SUBDIRS(glew)
+IF(WITH_OPENJPEG)
+ SUBDIRS(libopenjpeg)
+ENDIF(WITH_OPENJPEG)
Added: trunk/blender/extern/libopenjpeg/CMakeLists.txt
===
--- trunk/blender/extern/libopenjpeg/CMakeLists.txt
(rev 0)
+++ trunk/blender/extern/libopenjpeg/CMakeLists.txt 2009-03-06 15:46:13 UTC
(rev 19211)
@@ -0,0 +1,32 @@
+# $Id: CMakeLists.txt 1 2008-04-16 22:40:48Z hos $
+# * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# * END GPL LICENSE BLOCK *
+
+SET(INC . src ${FREETYPE_INC})
+
+FILE(GLOB SRC *.c except t1_generate_luts.c)
+ADD_DEFINITIONS(-DWITH_OPENJPEG)
+BLENDERLIB(extern_libopenjpeg ${SRC} ${INC})
+#, libtype=['international','player'], priority=[5, 210])
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===
---
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19104] branches/blender2.5/blender/source /blender/editors: Added return statements to a couple of functions that didn't have
Revision: 19104
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19104
Author: sirdude
Date: 2009-02-24 17:51:55 +0100 (Tue, 24 Feb 2009)
Log Message:
---
Added return statements to a couple of functions that didn't have
them and removed an extra ;
Kent
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/space_action/action_edit.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_edit.c
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_action/action_edit.c
===
---
branches/blender2.5/blender/source/blender/editors/space_action/action_edit.c
2009-02-24 12:38:56 UTC (rev 19103)
+++
branches/blender2.5/blender/source/blender/editors/space_action/action_edit.c
2009-02-24 16:51:55 UTC (rev 19104)
@@ -256,6 +256,8 @@
/* clean up */
BLI_freelistN(anim_data);
+
+ return ok;
}
@@ -273,6 +275,8 @@
/* clean up */
BLI_freelistN(anim_data);
+
+ return ok;
}
/* --- */
Modified:
branches/blender2.5/blender/source/blender/editors/space_graph/graph_edit.c
===
--- branches/blender2.5/blender/source/blender/editors/space_graph/graph_edit.c
2009-02-24 12:38:56 UTC (rev 19103)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_edit.c
2009-02-24 16:51:55 UTC (rev 19104)
@@ -264,9 +264,10 @@
/* clean up */
BLI_freelistN(anim_data);
+
+ return ok;
}
-
static short paste_graph_keys (bAnimContext *ac)
{
ListBase anim_data = {NULL, NULL};
@@ -281,6 +282,8 @@
/* clean up */
BLI_freelistN(anim_data);
+
+ return ok;
}
/* --- */
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
===
--- branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
2009-02-24 12:38:56 UTC (rev 19103)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
2009-02-24 16:51:55 UTC (rev 19104)
@@ -1047,7 +1047,7 @@
window_set_cursor(win, oldcursor);
}
-#endif;
+#endif
/* ** size widget operator */
___
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 [19058] branches/blender2.5/blender/source /blender/blenfont/CMakeLists.txt: Small tweak to get cmake working again.
Revision: 19058
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=19058
Author: sirdude
Date: 2009-02-20 18:20:20 +0100 (Fri, 20 Feb 2009)
Log Message:
---
Small tweak to get cmake working again.
Kent
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
Modified: branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
===
--- branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
2009-02-20 16:39:39 UTC (rev 19057)
+++ branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
2009-02-20 17:20:20 UTC (rev 19058)
@@ -26,7 +26,7 @@
SET(INC
../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include
- ../blenkernel ../ftfont ../../../extern/glew/include
+ ../blenkernel ../ftfont ../../../extern/glew/include .
${FTGL_INC}
${FREETYPE_INC}
${GETTEXT_INC}
___
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 [18907] branches/blender2.5/blender/source /blender/blenlib: removed dos line endings on some other files.
Revision: 18907
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18907
Author: sirdude
Date: 2009-02-10 17:53:42 +0100 (Tue, 10 Feb 2009)
Log Message:
---
removed dos line endings on some other files.
Kent
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenlib/BLI_listbase.h
branches/blender2.5/blender/source/blender/blenlib/BLI_noise.h
branches/blender2.5/blender/source/blender/blenlib/BLI_string.h
Modified: branches/blender2.5/blender/source/blender/blenlib/BLI_listbase.h
===
--- branches/blender2.5/blender/source/blender/blenlib/BLI_listbase.h
2009-02-10 16:51:04 UTC (rev 18906)
+++ branches/blender2.5/blender/source/blender/blenlib/BLI_listbase.h
2009-02-10 16:53:42 UTC (rev 18907)
@@ -1,63 +1,63 @@
-/*
- * $Id: BLI_blenlib.h 17433 2008-11-12 21:16:53Z blendix $
- *
- * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 *
- *
- * $Id: $
-*/
-
-#ifndef BLI_LISTBASE_H
-#define BLI_LISTBASE_H
-
-//#include DNA_listbase.h
-struct ListBase;
-
-#ifdef __cplusplus
-extern C {
-#endif
-
-void addlisttolist(struct ListBase *list1, struct ListBase *list2);
-void BLI_insertlink(struct ListBase *listbase, void *vprevlink, void
*vnewlink);
-void *BLI_findlink(struct ListBase *listbase, int number);
-int BLI_findindex(struct ListBase *listbase, void *vlink);
-void BLI_freelistN(struct ListBase *listbase);
-void BLI_addtail(struct ListBase *listbase, void *vlink);
-void BLI_remlink(struct ListBase *listbase, void *vlink);
-
-void BLI_addhead(struct ListBase *listbase, void *vlink);
-void BLI_insertlinkbefore(struct ListBase *listbase, void *vnextlink, void
*vnewlink);
-void BLI_insertlinkafter(struct ListBase *listbase, void *vprevlink, void
*vnewlink);
-void BLI_sortlist(struct ListBase *listbase, int (*cmp)(void *, void *));
-void BLI_freelist(struct ListBase *listbase);
-int BLI_countlist(struct ListBase *listbase);
-void BLI_freelinkN(struct ListBase *listbase, void *vlink);
-void BLI_duplicatelist(struct ListBase *list1, struct ListBase *list2); /*
copy from 2 to 1 */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+/*
+ * $Id: BLI_blenlib.h 17433 2008-11-12 21:16:53Z blendix $
+ *
+ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 *
+ *
+ * $Id: $
+*/
+
+#ifndef BLI_LISTBASE_H
+#define BLI_LISTBASE_H
+
+//#include DNA_listbase.h
+struct ListBase;
+
+#ifdef __cplusplus
+extern C {
+#endif
+
+void addlisttolist(struct ListBase *list1, struct ListBase *list2);
+void BLI_insertlink(struct ListBase *listbase, void *vprevlink, void
*vnewlink);
+void *BLI_findlink(struct ListBase *listbase, int number);
+int BLI_findindex(struct ListBase *listbase, void *vlink);
+void BLI_freelistN(struct ListBase *listbase);
+void BLI_addtail(struct ListBase *listbase, void *vlink);
+void BLI_remlink(struct ListBase *listbase, void *vlink);
+
+void BLI_addhead(struct ListBase *listbase, void *vlink);
+void BLI_insertlinkbefore(struct ListBase *listbase, void *vnextlink, void
*vnewlink);
+void
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18908] branches/blender2.5/blender: A few more files with dos line endings.
Revision: 18908
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18908
Author: sirdude
Date: 2009-02-10 18:06:43 +0100 (Tue, 10 Feb 2009)
Log Message:
---
A few more files with dos line endings.
Kent
Modified Paths:
--
branches/blender2.5/blender/extern/libopenjpeg/opj_malloc.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_animsys.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_fcurve.h
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c
branches/blender2.5/blender/source/blender/blenlib/intern/dynamiclist.c
branches/blender2.5/blender/source/blender/blenlib/intern/dynamiclist.h
branches/blender2.5/blender/source/blender/blenlib/intern/listbase.c
branches/blender2.5/blender/source/blender/blenlib/intern/string.c
branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
branches/blender2.5/blender/source/blender/editors/animation/keyframes_edit.c
branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c
branches/blender2.5/blender/source/blender/editors/include/ED_keyframes_draw.h
branches/blender2.5/blender/source/blender/editors/include/ED_keyframes_edit.h
branches/blender2.5/blender/source/blender/editors/include/ED_keyframing.h
branches/blender2.5/blender/source/blender/editors/space_action/action_edit.c
branches/blender2.5/blender/source/blender/editors/space_action/action_ops.c
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_edit.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_ops.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_select.c
branches/blender2.5/blender/source/blender/makesdna/DNA_anim_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_constraint.c
Modified: branches/blender2.5/blender/extern/libopenjpeg/opj_malloc.h
===
--- branches/blender2.5/blender/extern/libopenjpeg/opj_malloc.h 2009-02-10
16:53:42 UTC (rev 18907)
+++ branches/blender2.5/blender/extern/libopenjpeg/opj_malloc.h 2009-02-10
17:06:43 UTC (rev 18908)
@@ -1,147 +1,147 @@
-/*
- * Copyright (c) 2005, Herv\xE9 Drolon, FreeImage Team
- * Copyright (c) 2007, Callum Lerwick s...@haxxed.com
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef __OPJ_MALLOC_H
-#define __OPJ_MALLOC_H
-/**
-...@file opj_malloc.h
-...@brief Internal functions
-
-The functions in opj_malloc.h are internal utilities used for memory
management.
-*/
-
-/** @defgroup MISC MISC - Miscellaneous internal functions */
-/*...@{*/
-
-/** @name Exported functions */
-/*...@{*/
-/* --- */
-
-/**
-Allocate an uninitialized memory block
-...@param size Bytes to allocate
-...@return Returns a void pointer to the allocated space, or NULL if there is
insufficient memory available
-*/
-#define opj_malloc(size) malloc(size)
-
-/**
-Allocate a memory block with elements initialized to 0
-...@param num Blocks to allocate
-...@param size Bytes per block to allocate
-...@return Returns a void pointer to the allocated space, or NULL if there is
insufficient memory available
-*/
-#define opj_calloc(num, size)
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18699] branches/blender2.5/blender/source /blender/editors/space_sequencer/sequencer_header.c: Was missing TRUE so I included extra header that had i
Revision: 18699 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18699 Author: sirdude Date: 2009-01-27 19:36:58 +0100 (Tue, 27 Jan 2009) Log Message: --- Was missing TRUE so I included extra header that had it, also fixed a call that had wrong number of args. Kent Modified Paths: -- branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c Modified: branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c === --- branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c 2009-01-27 18:10:14 UTC (rev 18698) +++ branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c 2009-01-27 18:36:58 UTC (rev 18699) @@ -39,6 +39,7 @@ #include BLI_blenlib.h +#include BKE_utildefines.h #include BKE_context.h #include BKE_screen.h #include BKE_sequence.h @@ -289,7 +290,7 @@ uiDefMenuButO(block, SEQUENCER_OT_add_movie_strip, NULL); uiDefMenuButO(block, SEQUENCER_OT_add_scene_strip, NULL); #ifdef WITH_FFMPEG - but= uiDefMenuButO(block, SEQUENCER_OT_add_movie_strip); + but= uiDefMenuButO(block, SEQUENCER_OT_add_movie_strip, NULL); RNA_boolean_set(uiButGetOperatorPtrRNA(but), sound, TRUE); #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 [17812] branches/blender2.5/blender/source : started whiping cmake into shape for 2.5 still need to figure out
Revision: 17812
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=17812
Author: sirdude
Date: 2008-12-12 21:41:30 +0100 (Fri, 12 Dec 2008)
Log Message:
---
started whiping cmake into shape for 2.5 still need to figure out
the rna stuff but its close. Need to get it working for
blender then copy over same to game engine.
Kent
Modified Paths:
--
branches/blender2.5/blender/source/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
branches/blender2.5/blender/source/blender/python/CMakeLists.txt
branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
branches/blender2.5/blender/source/creator/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/VideoTexture/CMakeLists.txt
Added Paths:
---
branches/blender2.5/blender/source/blender/makesrna/CMakeLists.txt
branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
Modified: branches/blender2.5/blender/source/blender/CMakeLists.txt
===
--- branches/blender2.5/blender/source/blender/CMakeLists.txt 2008-12-12
20:11:45 UTC (rev 17811)
+++ branches/blender2.5/blender/source/blender/CMakeLists.txt 2008-12-12
20:41:30 UTC (rev 17812)
@@ -24,7 +24,7 @@
#
# * END GPL LICENSE BLOCK *
-SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader
blenpluginapi imbuf imbuf/intern/cineon gpu makesdna python radiosity
readblenfile render yafray)
+SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader
blenpluginapi imbuf imbuf/intern/cineon gpu makesdna makesrna python radiosity
readblenfile render yafray)
IF(WITH_INTERNATIONAL)
SUBDIRS(ftfont)
Modified: branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
===
--- branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
2008-12-12 20:11:45 UTC (rev 17811)
+++ branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
2008-12-12 20:41:30 UTC (rev 17812)
@@ -29,13 +29,13 @@
SET(INC ../windowmanager
../editors/include
../../../intern/guardedalloc ../../../intern/memutil
- ../blenlib ../makesdna ../blenkernel
+ ../blenlib ../makesdna ../makesrna ../blenkernel
../include ../../../intern/bmfont ../imbuf ../render/extern/include
../../../intern/bsp/extern ../radiosity/extern/include
../../../intern/decimation/extern ../blenloader ../python
../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
../quicktime ../../../intern/elbeem/extern
- ../../../intern/ghost ../../../intern/opennl/extern
+ ../../../intern/ghost ../../../intern/opennl/extern
../../../extern/glew/include
../nodes
${PYTHON_INC}
${SDL_INC}
Modified:
branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
===
--- branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
2008-12-12 20:11:45 UTC (rev 17811)
+++ branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
2008-12-12 20:41:30 UTC (rev 17812)
@@ -29,23 +29,24 @@
FILE(GLOB SRC */*.c)
-SET(INC ../windowmanager
- ../editors/include
- ../../../intern/guardedalloc ../../../intern/memutil
- ../blenlib ../makesdna ../blenkernel
- ../include ../../../intern/bmfont ../imbuf ../render/extern/include
- ../../../intern/bsp/extern ../radiosity/extern/include
- ../../../intern/decimation/extern ../blenloader ../python
- ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
- ../quicktime ../../../intern/elbeem/extern
- ../../../intern/ghost ../../../intern/opennl/extern
- ../nodes
+SET(INC ../../windowmanager
+ ../../editors/include
+ ../../../../intern/guardedalloc ../../../../intern/memutil
+ ../../blenlib ../../makesdna ../../makesrna ../../blenkernel
+ ../../include ../../../../intern/bmfont ../../imbuf
+ ../../render/extern/include ../../../../intern/bsp/extern
+ ../../radiosity/extern/include
+ ../../../intern/decimation/extern ../../blenloader ../../python
+ ../../../kernel/gen_system ../../../../intern/SoundSystem
../../readstreamglue
+ ../../quicktime ../../../../intern/elbeem/extern
+ ../../../../intern/ghost ../../../../intern/opennl/extern
+ ../../nodes
${PYTHON_INC}
${SDL_INC}
)
IF(WITH_INTERNATIONAL)
- SET(INC ${INC} ../ftfont)
+ SET(INC ${INC} ../../ftfont)
ADD_DEFINITIONS(-DINTERNATIONAL)
ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY)
ENDIF(WITH_INTERNATIONAL)
Added: branches/blender2.5/blender/source/blender/makesrna/CMakeLists.txt
===
--- branches/blender2.5/blender/source/blender/makesrna/CMakeLists.txt
(rev 0)
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17697] branches/blender2.5/blender: A couple of small fixes to clear up some warnings.
Revision: 17697
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=17697
Author: sirdude
Date: 2008-12-03 18:36:30 +0100 (Wed, 03 Dec 2008)
Log Message:
---
A couple of small fixes to clear up some warnings.
BOP_Merge2.cpp
had same variable name at different scopes so I renamed a couple.
resources.c
added include that was missing. (This maybe was going to move? the old
one
was commented out)
ed_markers.c
initalized a var that needed it.
Kent
Modified Paths:
--
branches/blender2.5/blender/intern/boolop/intern/BOP_Merge2.cpp
branches/blender2.5/blender/source/blender/editors/interface/resources.c
branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c
Modified: branches/blender2.5/blender/intern/boolop/intern/BOP_Merge2.cpp
===
--- branches/blender2.5/blender/intern/boolop/intern/BOP_Merge2.cpp
2008-12-03 17:11:50 UTC (rev 17696)
+++ branches/blender2.5/blender/intern/boolop/intern/BOP_Merge2.cpp
2008-12-03 17:36:30 UTC (rev 17697)
@@ -294,8 +294,8 @@
BOP_Vertexs v = m_mesh-getVertexs();
for( BOP_IT_Vertexs it = v.begin(); it != v.end(); ++it ) {
if( (*it)-getTAG() != BROKEN) {
- BOP_Indexs edges = (*it)-getEdges();
- for(BOP_IT_Indexs i = edges.begin();i!=edges.end();i++)
+ BOP_Indexs iedges = (*it)-getEdges();
+ for(BOP_IT_Indexs i =
iedges.begin();i!=iedges.end();i++)
if( m_mesh-getEdge((*i))-getUsed( ) == false)
(*it)-removeEdge( *i );
if( (*it)-getEdges().size() == 0 )
(*it)-setTAG(BROKEN);
}
@@ -432,8 +432,8 @@
vert-setTAG(BROKEN);
for(BOP_IT_Indexs it = edges.begin();
it != edges.end();
++it ) {
- BOP_Edge *edge =
m_mesh-getEdge(*it);
- edge-setUsed(false);
+ BOP_Edge *tedge =
m_mesh-getEdge(*it);
+ tedge-setUsed(false);
}
didMerge = true;
}
Modified:
branches/blender2.5/blender/source/blender/editors/interface/resources.c
===
--- branches/blender2.5/blender/source/blender/editors/interface/resources.c
2008-12-03 17:11:50 UTC (rev 17696)
+++ branches/blender2.5/blender/source/blender/editors/interface/resources.c
2008-12-03 17:36:30 UTC (rev 17697)
@@ -53,6 +53,7 @@
#include BIF_gl.h
#include UI_resources.h
+#include UI_interface_icons.h
//#include UI_icons.h
#include BLI_blenlib.h
Modified:
branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c
===
--- branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c
2008-12-03 17:11:50 UTC (rev 17696)
+++ branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c
2008-12-03 17:36:30 UTC (rev 17697)
@@ -254,7 +254,8 @@
ListBase *markers= context_get_markers(C);
MarkerMove *mm;
TimeMarker *marker;
- int totmark, a;
+ int totmark=0;
+ int a;
for (marker= markers-first; marker; marker= marker-next)
if (marker-flag SELECT) totmark++;
___
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 [17528] trunk/blender/config/irix6-config. py: This is patch [#17896] Irix Build Files
Revision: 17528
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=17528
Author: sirdude
Date: 2008-11-21 18:22:17 +0100 (Fri, 21 Nov 2008)
Log Message:
---
This is patch [#17896] Irix Build Files
Submitted By:
Timothy Baldridge (tbaldridge)
Add's scons support for irix.
Kent
Added Paths:
---
trunk/blender/config/irix6-config.py
Added: trunk/blender/config/irix6-config.py
===
--- trunk/blender/config/irix6-config.py(rev 0)
+++ trunk/blender/config/irix6-config.py2008-11-21 17:22:17 UTC (rev
17528)
@@ -0,0 +1,231 @@
+import os
+
+LCGDIR = os.getcwd()+/../lib/irix-6.5-mips
+LIBDIR = LCGDIR
+print LCGDIR
+
+WITH_BF_VERSE = 'false'
+BF_VERSE_INCLUDE = #extern/verse/dist
+
+BF_PYTHON = LCGDIR+'/python'
+BF_PYTHON_VERSION = '2.5'
+WITH_BF_STATICPYTHON = 'true'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
#BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
+BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
+BF_PYTHON_LIB_STATIC =
'${BF_PYTHON}/lib/python2.5/config/libpython${BF_PYTHON_VERSION}.a'
+
+WITH_BF_OPENAL = 'true'
+WITH_BF_STATICOPENAL = 'true'
+BF_OPENAL = LCGDIR+'/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+BF_OPENAL_LIBPATH = LIBDIR + '/lib'
+
+# some distros have a separate libalut
+# if you get linker complaints, you need to uncomment the line below
+# BF_OPENAL_LIB = 'openal alut'
+# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a
${BF_OPENAL}/lib/libalut.a'
+
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_SDL = 'true'
+BF_SDL = LCGDIR+'/SDL' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config
--cflags)
+BF_SDL_LIB = 'SDL audio iconv charset' #BF_SDL #$(shell
$(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+WITH_BF_FMOD = 'false'
+BF_FMOD = LIBDIR + '/fmod'
+
+WITH_BF_OPENEXR = 'false'
+WITH_BF_STATICOPENEXR = 'false'
+BF_OPENEXR = '/usr'
+# when compiling with your own openexr lib you might need to set...
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
+
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a
${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a
${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
+
+WITH_BF_DDS = 'false'
+
+WITH_BF_JPEG = 'false'
+BF_JPEG = LCGDIR+'/jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = 'false'
+BF_PNG = LCGDIR+/png
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+BF_TIFF = '/usr/nekoware'
+BF_TIFF_INC = '${BF_TIFF}/include'
+
+WITH_BF_ZLIB = 'true'
+BF_ZLIB = LCGDIR+/zlib
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
+
+WITH_BF_INTERNATIONAL = 'true'
+
+BF_GETTEXT = LCGDIR+'/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextpo intl'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = 'true'
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE='false'
+
+WITH_BF_ODE = 'false'
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = BF_ODE + '/include'
+BF_ODE_LIB = BF_ODE + '/lib/libode.a'
+
+WITH_BF_BULLET = 'true'
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+WITH_BF_YAFRAY = 'true'
+
+#WITH_BF_NSPR = 'true'
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB =
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr
-I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom
-I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+#
+# Be paranoid regarding library creation (do not update archives)
+#BF_PARANOID = 'true'
+
+# enable freetype2 support for text objects
+BF_FREETYPE = LCGDIR+'/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = 'false' #
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17530] trunk/lib/irix-6.5-mips/png: part 2 of irix libs.
Revision: 17530 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=17530 Author: sirdude Date: 2008-11-21 19:01:12 +0100 (Fri, 21 Nov 2008) Log Message: --- part 2 of irix libs. Kent Added Paths: --- trunk/lib/irix-6.5-mips/png/include/png.h trunk/lib/irix-6.5-mips/png/include/pngconf.h trunk/lib/irix-6.5-mips/png/lib/libpng.a Added: trunk/lib/irix-6.5-mips/png/include/png.h === --- trunk/lib/irix-6.5-mips/png/include/png.h (rev 0) +++ trunk/lib/irix-6.5-mips/png/include/png.h 2008-11-21 18:01:12 UTC (rev 17530) @@ -0,0 +1 @@ +link libpng12/png.h \ No newline at end of file Property changes on: trunk/lib/irix-6.5-mips/png/include/png.h ___ Name: svn:special + * Added: trunk/lib/irix-6.5-mips/png/include/pngconf.h === --- trunk/lib/irix-6.5-mips/png/include/pngconf.h (rev 0) +++ trunk/lib/irix-6.5-mips/png/include/pngconf.h 2008-11-21 18:01:12 UTC (rev 17530) @@ -0,0 +1 @@ +link libpng12/pngconf.h \ No newline at end of file Property changes on: trunk/lib/irix-6.5-mips/png/include/pngconf.h ___ Name: svn:special + * Added: trunk/lib/irix-6.5-mips/png/lib/libpng.a === --- trunk/lib/irix-6.5-mips/png/lib/libpng.a(rev 0) +++ trunk/lib/irix-6.5-mips/png/lib/libpng.a2008-11-21 18:01:12 UTC (rev 17530) @@ -0,0 +1 @@ +link libpng12.a \ No newline at end of file Property changes on: trunk/lib/irix-6.5-mips/png/lib/libpng.a ___ Name: svn:special + * ___ 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 [17245] trunk/blender/source/blender/src/ interface.c: This is coverity issue CID: 456
Revision: 17245
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=17245
Author: sirdude
Date: 2008-10-31 15:15:35 +0100 (Fri, 31 Oct 2008)
Log Message:
---
This is coverity issue CID: 456
fixes a buffer overrun issue.
Kent
Modified Paths:
--
trunk/blender/source/blender/src/interface.c
Modified: trunk/blender/source/blender/src/interface.c
===
--- trunk/blender/source/blender/src/interface.c2008-10-31 13:58:59 UTC
(rev 17244)
+++ trunk/blender/source/blender/src/interface.c2008-10-31 14:15:35 UTC
(rev 17245)
@@ -1808,7 +1808,7 @@
((G.qual LR_COMMANDKEY) || (G.qual LR_CTRLKEY))
((dev==XKEY) || (dev==CKEY) || (dev==VKEY)) ) {
- char buf[UI_MAX_DRAW_STR]={0};
+ char buf[UI_MAX_DRAW_STR+1]={0};
/* paste */
if (dev==VKEY) {
___
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 [17210] trunk/blender/blenderplayer/ CMakeLists.txt: Fixes blenderplayer for dds stuff
Revision: 17210 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=17210 Author: sirdude Date: 2008-10-28 20:53:54 +0100 (Tue, 28 Oct 2008) Log Message: --- Fixes blenderplayer for dds stuff Kent Modified Paths: -- trunk/blender/blenderplayer/CMakeLists.txt Modified: trunk/blender/blenderplayer/CMakeLists.txt === --- trunk/blender/blenderplayer/CMakeLists.txt 2008-10-28 18:47:13 UTC (rev 17209) +++ trunk/blender/blenderplayer/CMakeLists.txt 2008-10-28 19:53:54 UTC (rev 17210) @@ -104,6 +104,7 @@ bf_blenlib bf_cineon bf_openexr +bf_dds bf_ftfont extern_ftgl bf_readblenfile ___ 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 [17009] trunk/blender: Removed entry for: heigth typo (its not in blender)
Revision: 17009 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=17009 Author: sirdude Date: 2008-10-10 22:18:35 +0200 (Fri, 10 Oct 2008) Log Message: --- Removed entry for: heigth typo (its not in blender) fixed some warnings for po files on solaris. couldn't tell utf-8 from UTF-8 Kent Modified Paths: -- trunk/blender/bin/.blender/locale/ar/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/bg/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/ca/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/cs/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/de/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/el/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/es/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/fi/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/hr/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/it/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/ja/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/ko/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/nl/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/pl/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/ro/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/ru/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/sr/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/[EMAIL PROTECTED]/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/sv/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/uk/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo trunk/blender/po/ar.po trunk/blender/po/bg.po trunk/blender/po/cs.po trunk/blender/po/el.po trunk/blender/po/hr.po trunk/blender/po/it.po trunk/blender/po/ko.po trunk/blender/po/ro.po trunk/blender/po/ru.po trunk/blender/po/sr.po trunk/blender/po/[EMAIL PROTECTED] trunk/blender/po/uk.po trunk/blender/po/zh_CN.po Modified: trunk/blender/bin/.blender/locale/ar/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/bg/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/ca/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/cs/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/de/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/el/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/es/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/fi/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/hr/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/it/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/ja/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/ko/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/nl/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/pl/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/ro/LC_MESSAGES/blender.mo === (Binary files differ) Modified:
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16989] trunk/blender/source/blender/src/ sequence.c: This is patch [#17773] seq plugin crash - use not converted to float with ibuf1 ibuf2
Revision: 16989
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=16989
Author: sirdude
Date: 2008-10-09 06:11:33 +0200 (Thu, 09 Oct 2008)
Log Message:
---
This is patch [#17773] seq plugin crash - use not converted to float with
ibuf1 ibuf2
Submitted by Rob Hausauer (paprmh)
See the link for details:
https://projects.blender.org/tracker/index.php?func=detailaid=17773group_id=9atid=127
Kent
Modified Paths:
--
trunk/blender/source/blender/src/sequence.c
Modified: trunk/blender/source/blender/src/sequence.c
===
--- trunk/blender/source/blender/src/sequence.c 2008-10-09 01:15:54 UTC (rev
16988)
+++ trunk/blender/source/blender/src/sequence.c 2008-10-09 04:11:33 UTC (rev
16989)
@@ -803,13 +803,19 @@
if (!se2-ibuf-rect_float se-ibuf-rect_float) {
IMB_float_from_rect(se2-ibuf);
}
-
+ if (!se3-ibuf-rect_float se-ibuf-rect_float) {
+ IMB_float_from_rect(se3-ibuf);
+ }
+
if (!se1-ibuf-rect !se-ibuf-rect_float) {
IMB_rect_from_float(se1-ibuf);
}
if (!se2-ibuf-rect !se-ibuf-rect_float) {
IMB_rect_from_float(se2-ibuf);
}
+ if (!se3-ibuf-rect !se-ibuf-rect_float) {
+ IMB_rect_from_float(se3-ibuf);
+ }
sh.execute(seq, cfra, fac, facf, x, y, se1-ibuf, se2-ibuf, se3-ibuf,
se-ibuf);
@@ -1731,9 +1737,10 @@
}
if(se-ibuf == 0) {
- /* if one of two first inputs are rectfloat, output is
float too */
+ /* if any inputs are rectfloat, output is float too */
if((se-se1 se-se1-ibuf
se-se1-ibuf-rect_float) ||
- (se-se2 se-se2-ibuf
se-se2-ibuf-rect_float))
+ (se-se2 se-se2-ibuf
se-se2-ibuf-rect_float) ||
+ (se-se3 se-se3-ibuf
se-se3-ibuf-rect_float))
se-ibuf= IMB_allocImBuf((short)seqrectx,
(short)seqrecty, 32, IB_rectfloat, 0);
else
se-ibuf= IMB_allocImBuf((short)seqrectx,
(short)seqrecty, 32, IB_rect, 0);
___
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 [16963] trunk/blender: Fixed some common typo's in our translation files.
Revision: 16963 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=16963 Author: sirdude Date: 2008-10-07 22:54:34 +0200 (Tue, 07 Oct 2008) Log Message: --- Fixed some common typo's in our translation files. Centre instead of Center Suface instead of Surface I probably won't do too many more of these but these were pretty easy. I'm starting to make some headway on creating a blender.pot file. http://www.cs.umn.edu/~mein/blender/gettext for anyone that is interested in status so far. Kent Modified Paths: -- trunk/blender/bin/.blender/locale/ar/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/bg/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/ca/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/cs/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/de/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/el/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/es/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/fi/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/hr/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/it/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/ja/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/ko/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/nl/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/pl/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/ro/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/ru/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/sr/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/[EMAIL PROTECTED]/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/sv/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/uk/LC_MESSAGES/blender.mo trunk/blender/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo trunk/blender/po/ar.po trunk/blender/po/bg.po trunk/blender/po/ca.po trunk/blender/po/cs.po trunk/blender/po/de.po trunk/blender/po/el.po trunk/blender/po/es.po trunk/blender/po/fi.po trunk/blender/po/fr.po trunk/blender/po/hr.po trunk/blender/po/it.po trunk/blender/po/ja.po trunk/blender/po/ko.po trunk/blender/po/nl.po trunk/blender/po/pl.po trunk/blender/po/pt_BR.po trunk/blender/po/ro.po trunk/blender/po/ru.po trunk/blender/po/sr.po trunk/blender/po/[EMAIL PROTECTED] trunk/blender/po/sv.po trunk/blender/po/uk.po trunk/blender/po/zh_CN.po Modified: trunk/blender/bin/.blender/locale/ar/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/bg/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/ca/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/cs/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/de/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/el/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/es/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/fi/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/hr/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/it/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/ja/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/ko/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/bin/.blender/locale/nl/LC_MESSAGES/blender.mo === (Binary files differ) Modified:
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16952] trunk/blender/intern/elbeem/intern /Makefile: patch [#17772] Fluid solver not built with OpenMP in Makefile build system
Revision: 16952 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=16952 Author: sirdude Date: 2008-10-06 21:57:42 +0200 (Mon, 06 Oct 2008) Log Message: --- patch [#17772] Fluid solver not built with OpenMP in Makefile build system Submitted By: gsr Kent Modified Paths: -- trunk/blender/intern/elbeem/intern/Makefile Modified: trunk/blender/intern/elbeem/intern/Makefile === --- trunk/blender/intern/elbeem/intern/Makefile 2008-10-06 17:37:03 UTC (rev 16951) +++ trunk/blender/intern/elbeem/intern/Makefile 2008-10-06 19:57:42 UTC (rev 16952) @@ -37,6 +37,10 @@ CCFLAGS += $(LEVEL_2_CPP_WARNINGS) +ifeq ($(WITH_BF_OPENMP),true) + CPPFLAGS += -DPARALLEL +endif + CPPFLAGS += -DNOGUI -DELBEEM_BLENDER CPPFLAGS += -I. CPPFLAGS += -I../extern ___ 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 [16883] trunk/blender/extern/bullet2/src: Maybe not needed, I was running into some problems though
Revision: 16883 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=16883 Author: sirdude Date: 2008-10-02 18:52:39 +0200 (Thu, 02 Oct 2008) Log Message: --- Maybe not needed, I was running into some problems though and noticed dos line endings in a bunch of files so ran dos2unix on everything in bullet2. Erwin, I noticed there are a few files that do not have license info in them, couple of quick examples are: btDefaultMotionState.h btHashMap.h btQuickprof.cpp could you take a look at add where needed? If you want I can give a list of files I think should get it added and or just add the standard one say the one in src/btBulletCollisionCommon.h Kent Modified Paths: -- trunk/blender/extern/bullet2/src/Bullet-C-Api.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16722] trunk/blender: This is part of the cleanup Campbell wanted :)
Revision: 16722
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=16722
Author: sirdude
Date: 2008-09-25 17:39:46 +0200 (Thu, 25 Sep 2008)
Log Message:
---
This is part of the cleanup Campbell wanted :)
Just getting rid of license_key stuff.
The project files still need to be updated:
projectfiles_vc7/blender/src/BL_src_cre.vcproj
projectfiles_vc7/blender/blendercompactNG.vcproj
Just search for these files in them.
Kent
Modified Paths:
--
trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp
Removed Paths:
-
trunk/blender/source/blender/include/license_key.h
trunk/blender/source/blender/src/cre/license.jpeg.c
trunk/blender/source/blender/src/cre/license_key.c
trunk/blender/source/blender/src/pub/license_key.c
Modified: trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp
===
--- trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp 2008-09-25
13:17:56 UTC (rev 16721)
+++ trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp 2008-09-25
15:39:46 UTC (rev 16722)
@@ -34,11 +34,6 @@
#include SND_Utils.h
#include SoundDefines.h
#include SND_DependKludge.h
-/*
-extern C {
-#include license_key.h
-}
-*/
#include stdio.h
#include stdlib.h
#include fcntl.h
Deleted: trunk/blender/source/blender/include/license_key.h
===
--- trunk/blender/source/blender/include/license_key.h 2008-09-25 13:17:56 UTC
(rev 16721)
+++ trunk/blender/source/blender/include/license_key.h 2008-09-25 15:39:46 UTC
(rev 16722)
@@ -1,92 +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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 *
- */
-#ifndef LICENCEKEY_H
-#define LICENCEKEY_H
-
-#define I_AM_PUBLISHER temp_val2
-#define LICENSE_KEY_VALID temp_val
-#define SHOW_LICENSE_KEY rotop
-
-extern int LICENSE_KEY_VALID;
-extern int I_AM_PUBLISHER;
-
-extern char * license_key_name;
-extern void loadKeyboard(char * name);
-extern void checkhome(void);
-extern void SHOW_LICENSE_KEY(void);
-
-#define LICENSE_CHECK_0 (0==0)
-
-// Stuff from the Python files from Strubi
-
-typedef int (*Fptr)(void *);
-
-extern Fptr g_functab[];
-extern Fptr g_ptrtab[];
-
-// TODO: From here on, this should be a generated header file...
-
-// change all KEY_FUNC values
-// if you change PYKEY_TABLEN or PYKEY_SEED
-// see below
-
-#define PYKEY_TABLEN 21 // don't change this unless needed. Other values
-// may yield bad random orders
-
-#define PYKEY_SEED {26,8,1972}
-
-// these values are generated by $HOME/develop/intern/keymaker/makeseed.py
-// from the above seed value.
-
-// DO NOT EDIT THESE VALUES BY HAND!
-
-#define KEY_FUNC1 12
-#define KEY_FUNC2 8
-#define KEY_FUNC3 1
-#define KEY_FUNC4 16
-#define KEY_FUNC5 20
-#define KEY_FUNC6 18
-#define KEY_FUNC7 13
-#define KEY_FUNC8 6
-#define KEY_FUNC9 9
-#define KEY_FUNC10 7
-#define KEY_FUNC11 14
-#define KEY_FUNC12 0
-#define KEY_FUNC13 5
-#define KEY_FUNC14 10
-#define KEY_FUNC15 19
-#define KEY_FUNC16 2
-#define KEY_FUNC17 11
-#define KEY_FUNC18 3
-#define KEY_FUNC19 17
-#define KEY_FUNC20 15
-#define KEY_FUNC21 4
-
-#endif
-
Deleted: trunk/blender/source/blender/src/cre/license.jpeg.c
===
--- trunk/blender/source/blender/src/cre/license.jpeg.c 2008-09-25 13:17:56 UTC
(rev 16721)
+++ trunk/blender/source/blender/src/cre/license.jpeg.c 2008-09-25 15:39:46 UTC
(rev 16722)
@@ -1,35 +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
- *
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16637] trunk/blender/bin/.blender/locale/ fr/LC_MESSAGES/blender.mo: the binary version of the french update.
Revision: 16637 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=16637 Author: sirdude Date: 2008-09-20 17:10:06 +0200 (Sat, 20 Sep 2008) Log Message: --- the binary version of the french update. (so windows users will be happy) Kent Modified Paths: -- trunk/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo Modified: trunk/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo === (Binary files differ) ___ 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 [16462] trunk/blender/source/blender/imbuf /intern/dds: This is patch:
Revision: 16462
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=16462
Author: sirdude
Date: 2008-09-10 17:07:20 +0200 (Wed, 10 Sep 2008)
Log Message:
---
This is patch:
[#15135] imbuf DDS support: sync to nvidia texture tools revision 602 + fix for
ATI2 compressed normal maps
It just updates the dds stuff.
Provided by Amorilia
Kent
Revision Links:
--
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=602
Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.cpp
trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.h
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.h
trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp
Modified: trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.cpp
===
--- trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.cpp
2008-09-10 13:02:58 UTC (rev 16461)
+++ trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.cpp
2008-09-10 15:07:20 UTC (rev 16462)
@@ -53,6 +53,14 @@
{
}
+/// Init the color block from an array of colors.
+ColorBlock::ColorBlock(const uint * linearImage)
+{
+ for(uint i = 0; i 16; i++) {
+ color(i) = Color32(linearImage[i]);
+ }
+}
+
/// Init the color block with the contents of the given block.
ColorBlock::ColorBlock(const ColorBlock block)
{
@@ -125,9 +133,12 @@
/// Returns true if the block has a single color.
bool ColorBlock::isSingleColor() const
{
+ Color32 mask(0xFF, 0xFF, 0xFF, 0x00);
+ uint u = m_color[0].u mask.u;
+
for(int i = 1; i 16; i++)
{
- if (m_color[0] != m_color[i])
+ if (u != (m_color[i].u mask.u))
{
return false;
}
@@ -136,6 +147,30 @@
return true;
}
+/// Returns true if the block has a single color, ignoring transparent pixels.
+bool ColorBlock::isSingleColorNoAlpha() const
+{
+ Color32 c;
+ int i;
+ for(i = 0; i 16; i++)
+ {
+ if (m_color[i].a != 0) c = m_color[i];
+ }
+
+ Color32 mask(0xFF, 0xFF, 0xFF, 0x00);
+ uint u = c.u mask.u;
+
+ for(; i 16; i++)
+ {
+ if (u != (m_color[i].u mask.u))
+ {
+ return false;
+ }
+ }
+
+ return true;
+}
+
/// Count number of unique colors in this color block.
uint ColorBlock::countUniqueColors() const
{
Modified: trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.h
===
--- trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.h 2008-09-10
13:02:58 UTC (rev 16461)
+++ trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.h 2008-09-10
15:07:20 UTC (rev 16462)
@@ -41,6 +41,7 @@
struct ColorBlock
{
ColorBlock();
+ ColorBlock(const uint * linearImage);
ColorBlock(const ColorBlock block);
ColorBlock(const Image * img, uint x, uint y);
@@ -51,6 +52,7 @@
void splatY();
bool isSingleColor() const;
+ bool isSingleColorNoAlpha() const;
uint countUniqueColors() const;
Color32 averageColor() const;
bool hasAlpha() const;
Modified: trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
===
--- trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
2008-09-10 13:02:58 UTC (rev 16461)
+++ trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
2008-09-10 15:07:20 UTC (rev 16462)
@@ -80,6 +80,10 @@
static const uint FOURCC_ATI1 = MAKEFOURCC('A', 'T', 'I', '1');
static const uint FOURCC_ATI2 = MAKEFOURCC('A', 'T', 'I', '2');
+static const uint FOURCC_A2XY = MAKEFOURCC('A', '2', 'X', 'Y');
+
+static const uint FOURCC_DX10 = MAKEFOURCC('D', 'X', '1', '0');
+
// 32 bit RGB formats.
static const uint D3DFMT_R8G8B8 = 20;
static const uint D3DFMT_A8R8G8B8 = 21;
@@ -279,6 +283,144 @@
D3D10_RESOURCE_DIMENSION_TEXTURE3D = 4,
};
+
+ const char * getDxgiFormatString(DXGI_FORMAT dxgiFormat)
+ {
+#define CASE(format) case DXGI_FORMAT_##format: return #format
+ switch(dxgiFormat)
+ {
+ CASE(UNKNOWN);
+
+ CASE(R32G32B32A32_TYPELESS);
+ CASE(R32G32B32A32_FLOAT);
+ CASE(R32G32B32A32_UINT);
+ CASE(R32G32B32A32_SINT);
+
+ CASE(R32G32B32_TYPELESS);
+ CASE(R32G32B32_FLOAT);
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16395] trunk/blender/source: converted my gen_utils.h fix to PyObjectPlus.h
Revision: 16395 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=16395 Author: sirdude Date: 2008-09-06 16:13:31 +0200 (Sat, 06 Sep 2008) Log Message: --- converted my gen_utils.h fix to PyObjectPlus.h Also added a fix for PyMarshal_WriteObjectToString Now I just need to figure out linking of the gameengine on my imac. Kent Modified Paths: -- trunk/blender/source/blender/python/api2_2x/gen_utils.h trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp trunk/blender/source/gameengine/Converter/Makefile trunk/blender/source/gameengine/Expressions/Makefile trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp trunk/blender/source/gameengine/Expressions/PyObjectPlus.h trunk/blender/source/gameengine/GameLogic/Makefile trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp trunk/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp trunk/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp trunk/blender/source/gameengine/Ketsji/KX_VehicleWrapper.cpp Modified: trunk/blender/source/blender/python/api2_2x/gen_utils.h === --- trunk/blender/source/blender/python/api2_2x/gen_utils.h 2008-09-06 13:24:42 UTC (rev 16394) +++ trunk/blender/source/blender/python/api2_2x/gen_utils.h 2008-09-06 14:13:31 UTC (rev 16395) @@ -45,6 +45,7 @@ Py_RETURN_NONE Python 2.4 macro. defined here until we switch to 2.4 + also in PyObjectPlus.h for gameengine */ #ifndef Py_RETURN_NONE #define Py_RETURN_NONE return Py_BuildValue(O, Py_None) Modified: trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp === --- trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp 2008-09-06 13:24:42 UTC (rev 16394) +++ trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp 2008-09-06 14:13:31 UTC (rev 16395) @@ -50,7 +50,7 @@ #include MT_Matrix4x4.h #include BKE_utildefines.h #include FloatValue.h -#include gen_utils.h /* Python stuff */ +#include PyObjectPlus.h #ifdef HAVE_CONFIG_H #include config.h Modified: trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp === --- trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp 2008-09-06 13:24:42 UTC (rev 16394) +++ trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp 2008-09-06 14:13:31 UTC (rev 16395) @@ -49,9 +49,8 @@ #include BLI_arithb.h #include MT_Matrix4x4.h #include BKE_utildefines.h +#include PyObjectPlus.h -#include gen_utils.h /* python stuff */ - #ifdef HAVE_CONFIG_H #include config.h #endif Modified: trunk/blender/source/gameengine/Converter/Makefile === --- trunk/blender/source/gameengine/Converter/Makefile 2008-09-06 13:24:42 UTC (rev 16394) +++ trunk/blender/source/gameengine/Converter/Makefile 2008-09-06 14:13:31 UTC (rev 16395) @@ -39,7 +39,6 @@ CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -CPPFLAGS += -I../../blender/python/api2_2x CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO) -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_SOLID)/include CPPFLAGS += -I$(NAN_BULLET2)/include Modified: trunk/blender/source/gameengine/Expressions/Makefile === --- trunk/blender/source/gameengine/Expressions/Makefile2008-09-06 13:24:42 UTC (rev 16394) +++ trunk/blender/source/gameengine/Expressions/Makefile2008-09-06 14:13:31 UTC (rev 16395) @@ -36,7 +36,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -CPPFLAGS += -I../../blender/python/api2_2x CPPFLAGS += -I../../blender/makesdna
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16383] trunk/blender/source/blender/src/ verse_image.c: Missing header.
Revision: 16383 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=16383 Author: sirdude Date: 2008-09-05 16:42:03 +0200 (Fri, 05 Sep 2008) Log Message: --- Missing header. Kent Modified Paths: -- trunk/blender/source/blender/src/verse_image.c Modified: trunk/blender/source/blender/src/verse_image.c === --- trunk/blender/source/blender/src/verse_image.c 2008-09-05 14:33:36 UTC (rev 16382) +++ trunk/blender/source/blender/src/verse_image.c 2008-09-05 14:42:03 UTC (rev 16383) @@ -43,6 +43,8 @@ #include BIF_verse.h #include BIF_space.h +#include GPU_draw.h + /* * unsubscribe from verse bitmap */ ___ 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 [16372] trunk/blender/source/gameengine/ Converter/BL_ShapeActionActuator.cpp: Found dos line endings.
Revision: 16372
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=16372
Author: sirdude
Date: 2008-09-05 04:29:59 +0200 (Fri, 05 Sep 2008)
Log Message:
---
Found dos line endings. (removed them)
Kent
Modified Paths:
--
trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
Modified: trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
===
--- trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
2008-09-05 00:28:17 UTC (rev 16371)
+++ trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
2008-09-05 02:29:59 UTC (rev 16372)
@@ -1,789 +1,789 @@
-/**
-* $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 *
-*/
-
-#if defined (__sgi)
-#include math.h
-#else
-#include cmath
-#endif
-
-#include SCA_LogicManager.h
-#include BL_ShapeActionActuator.h
-#include BL_ActionActuator.h
-#include BL_ShapeDeformer.h
-#include KX_GameObject.h
-#include STR_HashedString.h
-#include DNA_action_types.h
-#include DNA_nla_types.h
-#include DNA_actuator_types.h
-#include BKE_action.h
-#include DNA_armature_types.h
-#include MEM_guardedalloc.h
-#include BLI_blenlib.h
-#include BLI_arithb.h
-#include MT_Matrix4x4.h
-#include BKE_utildefines.h
-
-#ifdef HAVE_CONFIG_H
-#include config.h
-#endif
-
-BL_ShapeActionActuator::~BL_ShapeActionActuator()
-{
-}
-
-void BL_ShapeActionActuator::ProcessReplica()
-{
- m_localtime=m_startframe;
- m_lastUpdate=-1;
-}
-
-void BL_ShapeActionActuator::SetBlendTime (float newtime)
-{
- m_blendframe = newtime;
-}
-
-CValue* BL_ShapeActionActuator::GetReplica()
-{
- BL_ShapeActionActuator* replica = new
BL_ShapeActionActuator(*this);//m_float,GetName());
- replica-ProcessReplica();
-
- // this will copy properties and so on...
- CValue::AddDataToReplica(replica);
- return replica;
-}
-
-bool BL_ShapeActionActuator::ClampLocalTime()
-{
- if (m_startframe m_endframe) {
- if (m_localtime m_startframe)
- {
- m_localtime = m_startframe;
- return true;
- }
- else if (m_localtime m_endframe)
- {
- m_localtime = m_endframe;
- return true;
- }
- } else {
- if (m_localtime m_startframe)
- {
- m_localtime = m_startframe;
- return true;
- }
- else if (m_localtime m_endframe)
- {
- m_localtime = m_endframe;
- return true;
- }
- }
- return false;
-}
-
-void BL_ShapeActionActuator::SetStartTime(float curtime)
-{
- float direction = m_startframe m_endframe ? 1.0 : -1.0;
-
- if (!(m_flag ACT_FLAG_REVERSE))
- m_starttime = curtime - direction*(m_localtime -
m_startframe)/KX_KetsjiEngine::GetAnimFrameRate();
- else
- m_starttime = curtime - direction*(m_endframe -
m_localtime)/KX_KetsjiEngine::GetAnimFrameRate();
-}
-
-void BL_ShapeActionActuator::SetLocalTime(float curtime)
-{
- float delta_time = (curtime -
m_starttime)*KX_KetsjiEngine::GetAnimFrameRate();
-
- if (m_endframe m_startframe)
- delta_time = -delta_time;
-
- if (!(m_flag ACT_FLAG_REVERSE))
- m_localtime = m_startframe + delta_time;
- else
- m_localtime = m_endframe - delta_time;
-}
-
-void BL_ShapeActionActuator::BlendShape(Key* key, float srcweight)
-{
- vectorfloat::const_iterator it;
- float dstweight;
- KeyBlock *kb;
-
- dstweight = 1.0F - srcweight;
-
- for (it=m_blendshape.begin(), kb = (KeyBlock*)key-block.first;
-kb it != m_blendshape.end();
-kb = (KeyBlock*)kb-next, it++) {
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16303] trunk/blender/source/blender/src/ editobject.c: Added missing null check to convertmenu
Revision: 16303 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=16303 Author: sirdude Date: 2008-08-29 16:19:34 +0200 (Fri, 29 Aug 2008) Log Message: --- Added missing null check to convertmenu Remported by alxarch. If you remove the active object and then tried alt-c it would crash. Kent Modified Paths: -- trunk/blender/source/blender/src/editobject.c Modified: trunk/blender/source/blender/src/editobject.c === --- trunk/blender/source/blender/src/editobject.c 2008-08-29 14:13:26 UTC (rev 16302) +++ trunk/blender/source/blender/src/editobject.c 2008-08-29 14:19:34 UTC (rev 16303) @@ -2828,6 +2828,7 @@ if(G.scene-id.lib) return; obact= OBACT; + if (obact == NULL) return; if(!obact-flag SELECT) return; if(G.obedit) return; ___ 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 [15589] trunk/blender/source/gameengine/ Rasterizer/Makefile: Updated so things compile.
Revision: 15589 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15589 Author: sirdude Date: 2008-07-15 20:12:08 +0200 (Tue, 15 Jul 2008) Log Message: --- Updated so things compile. (Missing includes needed) Kent Modified Paths: -- trunk/blender/source/gameengine/Rasterizer/Makefile Modified: trunk/blender/source/gameengine/Rasterizer/Makefile === --- trunk/blender/source/gameengine/Rasterizer/Makefile 2008-07-15 17:03:59 UTC (rev 15588) +++ trunk/blender/source/gameengine/Rasterizer/Makefile 2008-07-15 18:12:08 UTC (rev 15589) @@ -41,7 +41,10 @@ CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I../../kernel/gen_system CPPFLAGS += -I../BlenderRoutines +CPPFLAGS += -I../Expressions +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) + ifeq ($(OS),darwin) CPPFLAGS += -fpascal-strings 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 [15361] trunk/blender/source/blender/ blenkernel/intern/image.c: Make it so it accepts blah. tiff as a filename not just blah.tif
Revision: 15361
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15361
Author: sirdude
Date: 2008-06-26 18:42:20 +0200 (Thu, 26 Jun 2008)
Log Message:
---
Make it so it accepts blah.tiff as a filename not just blah.tif
This is for bug [#15132] When saving a render .tif is appended to the saved
file even if the name contains .tiff
Kent
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/image.c
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===
--- trunk/blender/source/blender/blenkernel/intern/image.c 2008-06-26
12:43:10 UTC (rev 15360)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2008-06-26
16:42:20 UTC (rev 15361)
@@ -857,8 +857,8 @@
extension= .bmp;
}
else if(G.have_libtiff (imtype==R_TIFF)) {
- if(!BLI_testextensie(string, .tif))
- extension= .tif;
+ if(!BLI_testextensie(string, .tif)
+ !BLI_testextensie(string, .tiff)) extension= .tif;
}
#ifdef WITH_OPENEXR
else if( ELEM(imtype, R_OPENEXR, R_MULTILAYER)) {
___
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 [15123] trunk/blender/source/gameengine/ Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h: Issue jms was having with # else on msvc.
Revision: 15123 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=15123 Author: sirdude Date: 2008-06-04 20:11:48 +0200 (Wed, 04 Jun 2008) Log Message: --- Issue jms was having with # else on msvc. Seems odd but easy to fix. Kent Modified Paths: -- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h === --- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h 2008-06-04 16:41:09 UTC (rev 15122) +++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h 2008-06-04 18:11:48 UTC (rev 15123) @@ -53,10 +53,10 @@ #elif defined(__APPLE__) # include mac_compat_glext.h # include OpenGL/glext.h -# else +#else # include GL/glext.h -# endif #endif +#endif #ifdef __sgi # undef GL_ARB_vertex_program ___ 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 [14692] trunk/blender/source/blender/ blenkernel/intern/constraint.c: fix for bad indexing found by Cyril Brulebois
Revision: 14692
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=14692
Author: sirdude
Date: 2008-05-05 19:26:33 +0200 (Mon, 05 May 2008)
Log Message:
---
fix for bad indexing found by Cyril Brulebois
Its making the identity matrix so I just removed the initalizing values
that were out of bounds.
Kent
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/constraint.c
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2008-05-05
16:56:44 UTC (rev 14691)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2008-05-05
17:26:33 UTC (rev 14692)
@@ -1104,9 +1104,9 @@
/* identity matrix - don't do anything if the two axes are the same */
else {
m[0][0]= m[1][1]= m[2][2]= 1.0;
- m[0][1]= m[0][2]= m[0][3]= 0.0;
- m[1][0]= m[1][2]= m[1][3]= 0.0;
- m[2][0]= m[2][1]= m[2][3]= 0.0;
+ m[0][1]= m[0][2]= 0.0;
+ m[1][0]= m[1][2]= 0.0;
+ m[2][0]= m[2][1]= 0.0;
}
}
___
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 [14694] trunk/blender/source: Fixed some indentation, I stumbled across (spaces vs tabs)
Revision: 14694
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=14694
Author: sirdude
Date: 2008-05-05 19:29:11 +0200 (Mon, 05 May 2008)
Log Message:
---
Fixed some indentation, I stumbled across (spaces vs tabs)
and also removed return 0 from a void stub.
Kent
Modified Paths:
--
trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Modified: trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
===
--- trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
2008-05-05 17:28:14 UTC (rev 14693)
+++ trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
2008-05-05 17:29:11 UTC (rev 14694)
@@ -355,7 +355,7 @@
/* editseq.c */
Sequence *get_forground_frame_seq(int frame){return 0;};
-void set_last_seq(Sequence *seq){return 0;};
+void set_last_seq(Sequence *seq){};
/* modifier.c stub */
void harmonic_coordinates_bind(struct MeshDeformModifierData *mmd,
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2008-05-05 17:28:14 UTC (rev 14693)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2008-05-05 17:29:11 UTC (rev 14694)
@@ -2176,70 +2176,71 @@
{
KX_GameObject* gameobj = (KX_GameObject*) sumolist-GetValue(i);
struct Object* blenderobject =
converter-FindBlenderObject(gameobj);
- int nummeshes = gameobj-GetMeshCount();
- RAS_MeshObject* meshobj = 0;
-ListBase *conlist;
-bConstraint *curcon;
-conlist = get_active_constraints2(blenderobject);
-if (conlist) {
-for (curcon = (bConstraint *)conlist-first; curcon;
curcon=(bConstraint *)curcon-next) {
-if (curcon-type==CONSTRAINT_TYPE_RIGIDBODYJOINT){
-bRigidBodyJointConstraint *dat=(bRigidBodyJointConstraint
*)curcon-data;
-//if (dat-tar)
-if (!dat-child){
- PHY_IPhysicsController*
physctr2 = 0;
- if (dat-tar)
- {
- KX_GameObject
*gotar=getGameOb(dat-tar-id.name,sumolist);
- if (gotar
gotar-GetPhysicsController())
-
physctr2 = (PHY_IPhysicsController*)
gotar-GetPhysicsController()-GetUserData();
- }
+ ListBase *conlist;
+ bConstraint *curcon;
+ conlist = get_active_constraints2(blenderobject);
- if
(gameobj-GetPhysicsController())
- {
- float
radsPerDeg = 6.283185307179586232f / 360.f;
+ if (conlist) {
+ for (curcon = (bConstraint *)conlist-first; curcon;
curcon=(bConstraint *)curcon-next) {
+ if
(curcon-type==CONSTRAINT_TYPE_RIGIDBODYJOINT){
-
PHY_IPhysicsController* physctrl = (PHY_IPhysicsController*)
gameobj-GetPhysicsController()-GetUserData();
- //we need to
pass a full constraint frame, not just axis
+ bRigidBodyJointConstraint
*dat=(bRigidBodyJointConstraint *)curcon-data;
+
+ if (!dat-child){
+
+ PHY_IPhysicsController*
physctr2 = 0;
+
+ if (dat-tar)
+ {
+ KX_GameObject
*gotar=getGameOb(dat-tar-id.name,sumolist);
+ if (gotar
gotar-GetPhysicsController())
+ physctr2 =
(PHY_IPhysicsController*) gotar-GetPhysicsController()-GetUserData();
+ }
+
+ if
(gameobj-GetPhysicsController())
+ {
+ float radsPerDeg =
6.283185307179586232f / 360.f;
+
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14517] trunk/blender/source/blender: Patch from Paprmh (Rob)
Revision: 14517
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=14517
Author: sirdude
Date: 2008-04-22 16:53:15 +0200 (Tue, 22 Apr 2008)
Log Message:
---
Patch from Paprmh (Rob)
forgot to update the check for valid sequence plugin version #
(The version bump didn't affect sequence plugins so missed it)
This patch also brought the plugin includes back inline with
imbuf stuff. I'm putting it on my todo to see if we can't
remove this duplication so that this is not a reoccuring issue.
Kent
Modified Paths:
--
trunk/blender/source/blender/blenpluginapi/iff.h
trunk/blender/source/blender/src/seqeffects.c
Modified: trunk/blender/source/blender/blenpluginapi/iff.h
===
--- trunk/blender/source/blender/blenpluginapi/iff.h2008-04-22 14:40:24 UTC
(rev 14516)
+++ trunk/blender/source/blender/blenpluginapi/iff.h2008-04-22 14:53:15 UTC
(rev 14517)
@@ -151,7 +151,7 @@
int userflags; /** Used to set imbuf to Dirty
and other stuff */
int *zbuf; /** z buffer data, original
zbuffer */
float *zbuf_float; /** z buffer data, camera coordinates
*/
- void *userdata;
+ void *userdata; /** temporary storage, only used by
baking at the moment */
unsigned char *encodedbuffer; /** Compressed image only used with
png currently */
unsigned int encodedsize; /** Size of data written to
encodedbuffer */
unsigned int encodedbuffersize; /** Size of encodedbuffer */
@@ -161,6 +161,7 @@
float dither; /** random dither value, for
conversion from float - byte rect */
struct MEM_CacheLimiterHandle_s * c_handle; /** handle for cache
limiter */
+ struct ImgInfo * img_info;
int refcounter; /** Refcounter for multiple users */
int index; /** reference index for ImBuf
lists */
Modified: trunk/blender/source/blender/src/seqeffects.c
===
--- trunk/blender/source/blender/src/seqeffects.c 2008-04-22 14:40:24 UTC
(rev 14516)
+++ trunk/blender/source/blender/src/seqeffects.c 2008-04-22 14:53:15 UTC
(rev 14517)
@@ -101,7 +101,7 @@
if (version != 0) {
pis-version= version();
- if (pis-version = 2 pis-version = 5) {
+ if (pis-version = 2 pis-version = 6) {
int (*info_func)(PluginInfo *);
PluginInfo *info= (PluginInfo*)
MEM_mallocN(sizeof(PluginInfo), plugin_info);
___
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 [14519] trunk/blender/source/blender: WITH_BULLET wasn't working for Makefiles.
Revision: 14519
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=14519
Author: sirdude
Date: 2008-04-22 21:14:33 +0200 (Tue, 22 Apr 2008)
Log Message:
---
WITH_BULLET wasn't working for Makefiles.
I changed it so its tests are more inline with other defines.
Jesterking said this shouldn't affect scons so yell at him if it does. ;)
Kent
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/src/buttons_object.c
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2008-04-22
15:37:54 UTC (rev 14518)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2008-04-22
19:14:33 UTC (rev 14519)
@@ -639,7 +639,7 @@
if ( i 4 )
{
// calc distance + normal
-#if WITH_BULLET == 1
+#ifdef WITH_BULLET
distance = plNearestPoints (
verts1[collpair-ap1].txold,
verts1[collpair-ap2].txold, verts1[collpair-ap3].txold,
collmd-current_x[collpair-bp1].co, collmd-current_x[collpair-bp2].co,
collmd-current_x[collpair-bp3].co, collpair-pa,collpair-pb,collpair-vector
);
#else
Modified: trunk/blender/source/blender/src/buttons_object.c
===
--- trunk/blender/source/blender/src/buttons_object.c 2008-04-22 15:37:54 UTC
(rev 14518)
+++ trunk/blender/source/blender/src/buttons_object.c 2008-04-22 19:14:33 UTC
(rev 14519)
@@ -5657,7 +5657,7 @@
else
uiDefBut(block, LABEL, 0, , 10,80,145,20, NULL, 0.0, 0, 0,
0, );
*/
-#if WITH_BULLET == 1
+#ifdef WITH_BULLET
uiDefButBitI(block, TOG, CLOTH_COLLSETTINGS_FLAG_ENABLED,
B_BAKE_CACHE_CHANGE, Enable collisions, 10,60,150,20,
clmd-coll_parms-flags, 0, 0, 0, 0, Enable collisions with this object);
if (clmd-coll_parms-flags CLOTH_COLLSETTINGS_FLAG_ENABLED)
{
___
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 [14506] trunk/blender: Update of the Urainian translation
Revision: 14506
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=14506
Author: sirdude
Date: 2008-04-21 22:57:23 +0200 (Mon, 21 Apr 2008)
Log Message:
---
Update of the Urainian translation
Submitted by: Serhij Dubyk
Kent
Modified Paths:
--
trunk/blender/bin/.blender/.Blanguages
trunk/blender/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
trunk/blender/po/uk.po
Modified: trunk/blender/bin/.blender/.Blanguages
===
--- trunk/blender/bin/.blender/.Blanguages 2008-04-21 19:24:30 UTC (rev
14505)
+++ trunk/blender/bin/.blender/.Blanguages 2008-04-21 20:57:23 UTC (rev
14506)
@@ -14,7 +14,7 @@
Russian:ru_RU
Croatian:hr_HR
Serbian:sr
-Ukrainian:uk
+Ukrainian:uk_UA
Polish:pl_PL
Romanian:ro
Arabic:ar
Modified: trunk/blender/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
===
(Binary files differ)
Modified: trunk/blender/po/uk.po
===
--- trunk/blender/po/uk.po 2008-04-21 19:24:30 UTC (rev 14505)
+++ trunk/blender/po/uk.po 2008-04-21 20:57:23 UTC (rev 14506)
@@ -1,51 +1,42 @@
# Ukrainian translation for blender
# This file is distributed under the same license as the blender package.
-# Serhij Dubyk [EMAIL PROTECTED], 2006.
+# Serhij Dubyk [EMAIL PROTECTED], 2008.
msgid
msgstr
-Project-Id-Version: blender\n
-POT-Creation-Date: 2006-03-27 13:42+0200\n
-PO-Revision-Date: 2007-01-30 12:54+0200\n
-Last-Translator: Serhij Dubyk [EMAIL PROTECTED]\n
+Project-Id-Version: blender246\n
+POT-Creation-Date: \n
+PO-Revision-Date: 2008-04-06 18:48+0300\n
+Last-Translator: Serhij Dubyk [EMAIL PROTECTED]\n
Language-Team: Ukrainian [EMAIL PROTECTED]\n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=utf-8\n
Content-Transfer-Encoding: 8bit\n
+X-Generator: Pootle 1.0.2\n
X-Poedit-Language: Ukrainian\n
X-Poedit-Country: UKRAINE\n
X-Poedit-SourceCharset: utf-8\n
X-Rosetta-Export-Date: 2007-01-29 06:40+\n
+Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2
n%10=4 (n%10010 || n%100=20) ? 1 : 2);\n
#, fuzzy
-msgid - sys evt
-msgstr Системні змінні
-
msgid Global Undo History
-msgstr Глобальна історія відмін
+msgstr Історія відміни
-msgid -1W
-msgstr -1W
-
msgid DataBrowse
msgstr Перегляд даних
msgid blendfile
msgstr
-# ##
msgid [Bone Dict: {
msgstr
-msgid }]\n
-msgstr
-
msgid Grid
msgstr Сітка
msgid Outside
msgstr Зовні
-# ##
msgid [Pose Bone Dict: {
msgstr
@@ -55,17 +46,21 @@
msgid Can't edit library data
msgstr Неможливо редагувати бібліотечні дані
+#, fuzzy
msgid New material
-msgstr Новий матеріал
+msgstr Матеріал
+#, fuzzy
msgid Delete material index
-msgstr Видалити покажчик матеріалу
+msgstr Вилучити індекс матеріалу
+#, fuzzy
msgid Assign material index
-msgstr Привласнити індекс матеріалу
+msgstr Додати новий індекс Матеріалу
+#, fuzzy
msgid Select material index
-msgstr Вибрати покажчик матеріалу
+msgstr Вилучити індекс матеріалу
msgid Set Smooth
msgstr Пригладжено
@@ -87,53 +82,54 @@
msgstr Розглядати усі пригладжені грані з кутами менше, ніж Degr: як
'згладжені' при промальовці.
msgid Degr:
-msgstr Град:
+msgstr
msgid Defines maximum angle between face normals that 'Auto Smooth' will
operate on
msgstr Визначає максимальний кут між нормалями граней для яких 'авто
згладжування' працюватиме
+#, fuzzy
msgid VertCol
-msgstr КолірВершин
+msgstr Колір вершини
msgid Make
msgstr Зробити
-msgid Enables vertex colour painting on active Mesh
-msgstr Дозволяє промалювання кольорових вершин на активному об'єкті
+msgid Enables vertex color painting on active Mesh
+msgstr
msgid Delete
-msgstr Видалити
+msgstr Вилучити
-msgid Deletes vertex colours on active Mesh
-msgstr Видаляє кольори вершин на активному об'єкті
+msgid Deletes vertex colors on active Mesh
+msgstr
#, fuzzy
msgid TexFace
-msgstr Ткстр Грнь
+msgstr Ткстр Прстр
-#, fuzzy
msgid Enables the active Mesh's faces for UV coordinate mapping
-msgstr Дозволяє UV-текстурування для граней активного об'єкту
+msgstr
msgid Deletes UV coordinates for active Mesh's faces
-msgstr Видаляє UV-координати у граней активного об'єкту
+msgstr
+#, fuzzy
msgid Sticky
-msgstr Липучка
+msgstr Статично
#, fuzzy
msgid Creates Sticky coordinates for the active Mesh from the current camera
view background picture
-msgstr Створити липкі координати для активного обє'кта від фонової картинки
поточної камери вигляду
+msgstr Створює липкі координати для активного об'єкта від фонової картинки з
вигляду поточної камери
msgid Deletes Sticky texture coordinates
-msgstr Видалити липкі текстуровані координати
+msgstr
msgid Slurph:
msgstr
#, fuzzy
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14451] trunk/blender/source/blender/imbuf /intern/radiance_hdr.c: My last commit for the sscanf buffer overflow did not really fix the
Revision: 14451
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=14451
Author: sirdude
Date: 2008-04-17 17:41:06 +0200 (Thu, 17 Apr 2008)
Log Message:
---
My last commit for the sscanf buffer overflow did not really fix the
problem. Now the fixed length strings are limited in the sscanf so
it should be much better now.
Kent
Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
Modified: trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
===
--- trunk/blender/source/blender/imbuf/intern/radiance_hdr.c2008-04-17
14:10:40 UTC (rev 14450)
+++ trunk/blender/source/blender/imbuf/intern/radiance_hdr.c2008-04-17
15:41:06 UTC (rev 14451)
@@ -182,7 +182,6 @@
unsigned char* ptr;
unsigned char* rect;
char oriY[80], oriX[80];
- char buff[STR_MAX];
if (imb_is_a_hdr((void*)mem))
{
@@ -194,8 +193,7 @@
}
}
if (found) {
- BLI_strncpy(buff, (char *)mem[x+1], sizeof(buff));
- if (sscanf(buff, %s %d %s %d, (char*)oriY, height,
+ if (sscanf((char *)mem[x+1], %80s %d %80s %d,
(char*)oriY, height,
(char*)oriX, width) != 4) return NULL;
/* find end of this line, data right behind it */
___
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 [14455] trunk/blender/tools/btools.py: I can't spell ; )
Revision: 14455
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=14455
Author: sirdude
Date: 2008-04-17 22:29:57 +0200 (Thu, 17 Apr 2008)
Log Message:
---
I can't spell ;)
(typo fix in the comments)
Kent
Modified Paths:
--
trunk/blender/tools/btools.py
Modified: trunk/blender/tools/btools.py
===
--- trunk/blender/tools/btools.py 2008-04-17 20:15:37 UTC (rev 14454)
+++ trunk/blender/tools/btools.py 2008-04-17 20:29:57 UTC (rev 14455)
@@ -273,7 +273,7 @@
('BF_FTGL_INC', 'FTGL include path', ''),
('BF_FTGL_LIB', 'FTGL libraries', ''),
-(BoolOption('WITH_BF_GLEXT', 'Enable GL Extenstions', 'true')),
+(BoolOption('WITH_BF_GLEXT', 'Enable GL Extensions', 'true')),
(BoolOption('WITH_BF_PLAYER', 'Build blenderplayer if true', 'false')),
('CFLAGS', 'C-compiler flags', ''),
___
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 [14440] trunk/blender/source/blender/ blenlib/intern/storage.c: This is a patch from the FreeBSD people:
Revision: 14440 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=14440 Author: sirdude Date: 2008-04-16 19:53:09 +0200 (Wed, 16 Apr 2008) Log Message: --- This is a patch from the FreeBSD people: http://www.freebsd.org/cgi/cvsweb.cgi/ports/graphics/blender/files/patch-source_blender_blenlib_intern-storage.c Kent Modified Paths: -- trunk/blender/source/blender/blenlib/intern/storage.c Modified: trunk/blender/source/blender/blenlib/intern/storage.c === --- trunk/blender/source/blender/blenlib/intern/storage.c 2008-04-16 17:40:59 UTC (rev 14439) +++ trunk/blender/source/blender/blenlib/intern/storage.c 2008-04-16 17:53:09 UTC (rev 14440) @@ -52,7 +52,7 @@ #if defined (__sun__) || defined (__sun) #include sys/statvfs.h /* Other modern unix os's should probably use this also */ -#elif !defined(linux) (defined(__sgi) || defined(__sparc) || defined(__sparc__)) +#elif !defined(__FreeBSD__) !defined(linux) (defined(__sgi) || defined(__sparc) || defined(__sparc__)) #include sys/statfs.h #endif @@ -209,7 +209,7 @@ #if defined (__sun__) || defined (__sun) if (statvfs(name, disk)) return(-1); -#elif !defined(linux) (defined (__sgi) || defined(__sparc) || defined(__sparc__)) +#elif !defined(__FreeBSD__) !defined(linux) (defined (__sgi) || defined(__sparc) || defined(__sparc__)) /* WARNING - This may not be supported by geeneric unix os's - Campbell */ if (statfs(name, disk, sizeof(struct statfs), 0)) return(-1); #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 [14317] trunk/blender/source: This commit reverts the #include mesa/glu.h
Revision: 14317 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=14317 Author: sirdude Date: 2008-04-02 17:03:03 +0200 (Wed, 02 Apr 2008) Log Message: --- This commit reverts the #include mesa/glu.h stuff used for peach to the standard GL/glu.h the mesa stuff was needed for the machines for peach but its not the stanard location of the headers, now that its not needed were switching it back. Kent Modified Paths: -- trunk/blender/source/blender/include/BIF_gl.h trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp Modified: trunk/blender/source/blender/include/BIF_gl.h === --- trunk/blender/source/blender/include/BIF_gl.h 2008-04-02 12:56:23 UTC (rev 14316) +++ trunk/blender/source/blender/include/BIF_gl.h 2008-04-02 15:03:03 UTC (rev 14317) @@ -56,20 +56,22 @@ #include OpenGL/gl.h #include OpenGL/glu.h #else - #if defined (__sun) || defined (__sun__) +/* #if defined (__sun) || defined (__sun__) #include GL/gl.h #include mesa/glu.h #else +*/ #include GL/gl.h #include GL/glu.h - #endif +/* #endif */ #endif + + /* * these should be phased out. cpack should be replaced in * code with calls to glColor3ub, lrectwrite probably should * change to a function. - zr */ - /* * * This define converts a numerical value to the equivalent 24-bit Modified: trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp === --- trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp2008-04-02 12:56:23 UTC (rev 14316) +++ trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp2008-04-02 15:03:03 UTC (rev 14317) @@ -9,12 +9,13 @@ #include OpenGL/glu.h #else #include GL/gl.h -#if defined(__sun__) !defined(__sparc__) +/* #if defined(__sun__) !defined(__sparc__) #include mesa/glu.h #else +*/ #include GL/glu.h +/* #endif */ #endif -#endif #include iostream #include BL_Shader.h Modified: trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp === --- trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp 2008-04-02 12:56:23 UTC (rev 14316) +++ trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp 2008-04-02 15:03:03 UTC (rev 14317) @@ -8,12 +8,12 @@ #include OpenGL/glu.h #else #include GL/gl.h -#if defined(__sun__) !defined(__sparc__) +/* #if defined(__sun__) !defined(__sparc__) #include mesa/glu.h -#else +#else */ #include GL/glu.h +/* #endif */ #endif -#endif #include iostream #include map Modified: trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp === --- trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp 2008-04-02 12:56:23 UTC (rev 14316) +++ trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp 2008-04-02 15:03:03 UTC (rev 14317) @@ -15,12 +15,13 @@ #include OpenGL/glu.h #else #include GL/gl.h -#if defined(__sun__) !defined(__sparc__) +/* #if defined(__sun__) !defined(__sparc__) #include mesa/glu.h #else +*/ #include GL/glu.h +/* #endif */ #endif -#endif #include KX_BlenderMaterial.h #include BL_Material.h Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp === --- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp2008-04-02 12:56:23 UTC (rev 14316) +++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp2008-04-02 15:03:03 UTC (rev 14317) @@ -44,12 +44,12 @@ #include OpenGL/glu.h #else #include GL/gl.h -#if defined(__sun__) !defined(__sparc__) +/* #if defined(__sun__) !defined(__sparc__) #include mesa/glu.h -#else +#else */ #include GL/glu.h +/* #endif */ #endif -#endif #ifdef WIN32 #pragma warning (disable : 4786) ___ 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 [14272] branches/soc-2007-hcube: Start of Makefile support for hcube branch....
Revision: 14272 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=14272 Author: sirdude Date: 2008-03-28 20:16:56 +0100 (Fri, 28 Mar 2008) Log Message: --- Start of Makefile support for hcube branch This isn't finished but its a start. I'm going on vacation for the weekend so I figured I'd commit incase cwant or some other person wants to play with it. Linking still needs to be done and cleaning up nan_definitions.mk Note Gameengine is still using old soundsystem so I think this branch still needs work before we merge it into main trunk... Kent Modified Paths: -- branches/soc-2007-hcube/extern/Makefile branches/soc-2007-hcube/intern/Makefile branches/soc-2007-hcube/source/blender/blenkernel/intern/Makefile branches/soc-2007-hcube/source/nan_definitions.mk Added Paths: --- branches/soc-2007-hcube/extern/tinySND/Makefile branches/soc-2007-hcube/intern/soundsystem/Makefile Modified: branches/soc-2007-hcube/extern/Makefile === --- branches/soc-2007-hcube/extern/Makefile 2008-03-28 17:03:34 UTC (rev 14271) +++ branches/soc-2007-hcube/extern/Makefile 2008-03-28 19:16:56 UTC (rev 14272) @@ -33,7 +33,7 @@ SOURCEDIR = extern DIR = $(OCGDIR)/extern -DIRS = qhull/src solid +DIRS = qhull/src solid ifeq ($(WITH_FREETYPE2), true) DIRS += bFTGL/src @@ -43,6 +43,10 @@ ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg) DIRS += ffmpeg endif + +# This needs to come after FFMPEG if its included +DIRS += tinySND + ifeq ($(NAN_FFMPEG), $(LCGDIR)/gcc/ffmpeg) DIRS += ffmpeg endif Added: branches/soc-2007-hcube/extern/tinySND/Makefile === --- branches/soc-2007-hcube/extern/tinySND/Makefile (rev 0) +++ branches/soc-2007-hcube/extern/tinySND/Makefile 2008-03-28 19:16:56 UTC (rev 14272) @@ -0,0 +1,136 @@ +# +# $Id: Makefile 6568 2006-01-28 18:33:28Z hos $ +# +# * BEGIN GPL/BL DUAL 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. The Blender +# Foundation also sells licenses for use in proprietary software under +# the Blender License. See http://www.blender.org/BL/ for information +# about this. +# +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/BL DUAL LICENSE BLOCK * +# +# + +LIBNAME = tinySND +DIR = $(OCGDIR)/extern/$(LIBNAME) + +CCFLAGS += $(LEVEL_1_CPP_WARNINGS) + +CSRCS = +CCSRCS = core/*.cpp +TINYSNDDIRS = core + +ifeq ($(WITH_FFMPEG), true) + CCSRCS = ffmpeg/*.cpp + CPPFLAGS += $(NAN_FFMPEGLIBS) + CPPFLAGS += -DWITH_FFMPEG + TINYSNDDIRS += ffmpeg +endif + +ifeq ($(WITH_BF_JACK), true) + CCSRCS = jack/*.cpp + CPPFLAGS += $(BF_JACK_INC) + CPPFLAGS += -DWITH_JACK + TINYSNDDIRS += jack +endif + +ifeq ($(WITH_BF_LADSPA), true) + CCSRCS = ladspa/*.cpp + CPPFLAGS += $(BF_LADSPA_INC) + CPPFLAGS += -DWITH_LADSPA + TINYSNDDIRS += ladspa +endif + +ifeq ($(WITH_BF_MAD), true) + CCSRCS = mad/*.cpp + CPPFLAGS += $(BF_MAD_INC) + CPPFLAGS += -DWITH_MAD + TINYSNDDIRS += mad +endif + +ifeq ($(WITH_BF_PORTAUDIO), true) + CCSRCS = portaudio/*.cpp + CPPFLAGS += $(BF_PORTAUDIO_INC) + CPPFLAGS += -DWITH_PORTAUDIO + TINYSNDDIRS += portaudio +endif + +ifeq ($(WITH_BF_SAMPLERATE), true) + CCSRCS = samplerate/*.cpp + CPPFLAGS += $(BF_SAMPLERATE_INC) + CPPFLAGS += -DWITH_SAMPLERATE + TINYSNDDIRS += samplerate +endif + +ifeq ($(WITH_BF_SDL), true) + CCSRCS = sdl/*.cpp + CPPFLAGS += $(NAN_SDLCFLAGS) + CPPFLAGS += -DWITH_SDL + TINYSNDDIRS += sdl +endif + +ifeq ($(WITH_BF_SNDFILE), true) + CCSRCS = sndfile/*.cpp + CPPFLAGS += $(BF_SNDFILE_INC) + CPPFLAGS += -DWITH_SNDFILE + TINYSNDDIRS += sndfile +endif + +ifeq ($(WITH_BF_VORBIS), true) + CCSRCS = vorbis/*.cpp + CPPFLAGS += $(BF_VORBIS_INC) + CPPFLAGS += -DWITH_VORBIS + TINYSNDDIRS += vorbis +endif + +ifeq ($(WITH_BF_WAVPACK), true) + CCSRCS = wavepack/*.cpp + CPPFLAGS += $(BF_WAVPACK_INC) + CPPFLAGS += -DWITH_WAVPACK + TINYSNDDIRS += wavepack +endif + +all debug:: objdirs + +include nan_compile.mk
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14188] trunk/blender: Update of the Italian translation thanks to Fabio.
Revision: 14188 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=14188 Author: sirdude Date: 2008-03-20 20:10:14 +0100 (Thu, 20 Mar 2008) Log Message: --- Update of the Italian translation thanks to Fabio. Kent Modified Paths: -- trunk/blender/bin/.blender/locale/it/LC_MESSAGES/blender.mo trunk/blender/po/it.po Modified: trunk/blender/bin/.blender/locale/it/LC_MESSAGES/blender.mo === (Binary files differ) Modified: trunk/blender/po/it.po === --- trunk/blender/po/it.po 2008-03-20 18:28:40 UTC (rev 14187) +++ trunk/blender/po/it.po 2008-03-20 19:10:14 UTC (rev 14188) @@ -1,7 +1,5 @@ # Italian translation for blender # -#msgid -#msgstr #Project-Id-Version: it-246\n #POT-Creation-Date: \n #PO-Revision-Date: 2008-02-29 21:39+0100\n @@ -311,7 +309,7 @@ msgstr Limite Unione: msgid Distance from axis within which mirrored vertices are merged -msgstr Distanza da asse da dove i vertici e i riflessi vengono uniti +msgstr Distanza da assi a dove i vertici riflessi si uniscono msgid Specify the axis to mirror about msgstr Specifica su quale asse fare la specchiatura @@ -320,7 +318,7 @@ msgstr Taglia msgid Prevents during Transform vertices to go through Mirror -msgstr Evita durante la Trasformazione i vertici che superano lo specchio +msgstr Evita durante la Trasformazione che i vertici superano il Mirror msgid Ratio: msgstr Rapporto: @@ -428,7 +426,7 @@ msgstr Ricalcola e cancella l'offset (trasformazione) del gancio msgid Recenter -msgstr Rincentra +msgstr Ricentra msgid Sets hook center to cursor position msgstr Imposta il centro del gancio dalla posizione del cursore @@ -6281,7 +6279,7 @@ msgstr Imposta la dimensione del buffer delle ombre msgid Sets the radius of the lightsource, 0 is same as pointlight -msgstr Imposta il raggio della sorgente di luce, 0 = a punto luce +msgstr Imposta il raggio della sorgente di luce, 0 = punto luce msgid Sets the distance value at which light intensity is half msgstr Imposta la distanza alla quale l'intensità della luce é dimezzata @@ -6464,7 +6462,7 @@ msgstr Fà si che la texture deformi la superfice msgid Sets the amount the texture displaces the surface -msgstr Stabilisce quanto la texture deforma la superfice +msgstr Stabilisce di quanto la texture deforma la superfice msgid Let the texture warp texture coordinates of next channels msgstr Consenti alla texture di influenzare le coordinate della texture sui canali successivi @@ -6668,7 +,7 @@ msgstr Abilita lunghezza d'onda del jittering, aggiunge rumore msgid Renders material as a halo -msgstr Restituisce il materiali come un alone +msgstr Restituisce il materiali con un alone msgid HaloSize: msgstr DimAlone: @@ -6887,16 +6885,16 @@ msgstr Visualizza Rampe Colore msgid Show ramp buttons for material diffuse color -msgstr Visualizza bottoni rampe per colore diffuso del materiale +msgstr Visualizza bottoni rampa per colore diffuso del materiale msgid Show Spec Ramp msgstr Visualizza Rampe Spec msgid Show ramp buttons for material specular color -msgstr Visualizza bottoni rampe per colore speculare del materiale +msgstr Visualizza bottoni rampa per colore speculare del materiale msgid Toggles colorband ramp operations -msgstr Abilita/Disabilita operazioni rampe banda colore +msgstr Abilita/Disabilita operazioni rampa banda colore msgid Factor msgstr Fattore @@ -6938,7 +6936,7 @@ msgstr Chiaro msgid Blending method for Ramp (uses alpha in Colorband) -msgstr Metodo per la sfumatura delle rampe (usa trasparenza nelle banda colore) +msgstr Metodo per la sfumatura della rampa (usa trasparenza nelle banda colore) msgid Blending factor (also uses alpha in Colorband) msgstr Fattore sfumatura (usa trasparenza nelle banda colore) @@ -10253,7 +10251,7 @@ msgstr Punto msgid Can't change because of pinned data -msgstr Impossibile cambiare perché dati bloccati +msgstr Impossibile cambiare : dati bloccati msgid Sets Ipo to be included in an Action or not msgstr Imposta l'Ipo per essere inclusa in una Azione o no @@ -12971,7 +12969,7 @@ msgstr Specchio asse-X msgid While using transforms, mirrors the transformation -msgstr Rispecchia la trasformazione mentre trasformi +msgstr Rifletti la trasformazione mentre trasformi msgid Empty Display: msgstr Visualizza Empty: @@ -13076,7 +13074,7 @@ msgstr Mostra opzioni proprietà confine msgid Obstacle causes zero normal and tangential velocity (=sticky). Default for all. Only option for moving objects. -msgstr L'ostacolo causa l'azzeramento della velocità normale e tangenziale (=viscoso).Prefissato per tutto.Solo opzione per oggetti in movimento. +msgstr L'ostacolo causa l'azzeramento della velocità normale e tangenziale (=viscoso).Prefissato per tutto.Opzione solo per
