[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23494] trunk/blender: Add directives to support multi dir lib.
Revision: 23494 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23494 Author: gsrb3d Date: 2009-09-26 00:38:15 +0200 (Sat, 26 Sep 2009) Log Message: --- Add directives to support multi dir lib. Modified Paths: -- trunk/blender/intern/itasc/Makefile trunk/blender/intern/itasc/kdl/Makefile trunk/blender/intern/itasc/kdl/utilities/Makefile trunk/blender/source/Makefile Modified: trunk/blender/intern/itasc/Makefile === --- trunk/blender/intern/itasc/Makefile 2009-09-25 18:47:43 UTC (rev 23493) +++ trunk/blender/intern/itasc/Makefile 2009-09-25 22:38:15 UTC (rev 23494) @@ -40,15 +40,14 @@ CPPFLAGS += -I. CPPFLAGS += -I../../extern/Eigen2 -install: all debug +install: $(ALL_OR_DEBUG) @[ -d $(NAN_ITASC) ] || mkdir $(NAN_ITASC) - @[ -d $(NAN_ITASC)/lib ] || mkdir $(NAN_ITASC)/lib - @[ -d $(NAN_ITASC)/lib/debug ] || mkdir $(NAN_ITASC)/lib/debug - @../tools/cpifdiff.sh $(DIR)/libitasc.a $(NAN_ITASC)/lib/ - @../tools/cpifdiff.sh $(DIR)/debug/libitasc.a $(NAN_ITASC)/lib/debug/ + @[ -d $(NAN_ITASC)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_ITASC)/lib/$(DEBUG_DIR) + @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libitasc.a $(DIR)/$(DEBUG_DIR)libitasc_kdl.a $(DIR)/$(DEBUG_DIR)libitasc_kdl_util.a $(NAN_ITASC)/lib/$(DEBUG_DIR) ifeq ($(OS),darwin) - ranlib $(NAN_ITASC)/lib/libitasc.a - ranlib $(NAN_ITASC)/lib/debug/libitasc.a + ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc.a + ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl.a + ranlib $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl_util.a endif ## include nan_subdirs.mk Modified: trunk/blender/intern/itasc/kdl/Makefile === --- trunk/blender/intern/itasc/kdl/Makefile 2009-09-25 18:47:43 UTC (rev 23493) +++ trunk/blender/intern/itasc/kdl/Makefile 2009-09-25 22:38:15 UTC (rev 23494) @@ -30,8 +30,9 @@ include nan_definitions.mk -LIBNAME = itasc -DIR = $(OCGDIR)/intern/$(LIBNAME) +LIBNAME = itasc_kdl +# Yep, same dir than parent (itasc instead of $(LIBNAME)) +DIR = $(OCGDIR)/intern/itasc DIRS = utilities SOURCEDIR = intern/$(LIBNAME)/kdl Modified: trunk/blender/intern/itasc/kdl/utilities/Makefile === --- trunk/blender/intern/itasc/kdl/utilities/Makefile 2009-09-25 18:47:43 UTC (rev 23493) +++ trunk/blender/intern/itasc/kdl/utilities/Makefile 2009-09-25 22:38:15 UTC (rev 23494) @@ -30,8 +30,9 @@ include nan_definitions.mk -LIBNAME = itasc -DIR = $(OCGDIR)/intern/$(LIBNAME) +LIBNAME = itasc_kdl_util +# Same dir than parent (itasc instead of $(LIBNAME)) +DIR = $(OCGDIR)/intern/itasc include nan_compile.mk Modified: trunk/blender/source/Makefile === --- trunk/blender/source/Makefile 2009-09-25 18:47:43 UTC (rev 23493) +++ trunk/blender/source/Makefile 2009-09-25 22:38:15 UTC (rev 23494) @@ -101,6 +101,8 @@ 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_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl.a +COMLIB += $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl_util.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 ___ 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=rev&root=bf-blender&revision=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 [23492] branches/ge_dyn_load: files that somehow didnt get merged
Revision: 23492 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23492 Author: campbellbarton Date: 2009-09-25 18:57:30 +0200 (Fri, 25 Sep 2009) Log Message: --- files that somehow didnt get merged Modified Paths: -- branches/ge_dyn_load/intern/audaspace/make/msvc_9_0/audaspace.vcproj branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj branches/ge_dyn_load/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj branches/ge_dyn_load/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj branches/ge_dyn_load/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj branches/ge_dyn_load/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj branches/ge_dyn_load/release/io/engine_render_pov.py branches/ge_dyn_load/release/io/export_ply.py branches/ge_dyn_load/release/ui/buttons_data_text.py branches/ge_dyn_load/release/ui/buttons_material.py branches/ge_dyn_load/release/ui/buttons_physics_fluid.py branches/ge_dyn_load/release/ui/buttons_scene.py branches/ge_dyn_load/release/ui/space_userpref.py branches/ge_dyn_load/release/ui/space_view3d_toolbar.py branches/ge_dyn_load/source/blender/editors/space_graph/graph_draw.c branches/ge_dyn_load/source/blender/editors/space_graph/graph_select.c branches/ge_dyn_load/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp branches/ge_dyn_load/source/gameengine/Ketsji/KX_PythonInit.cpp Modified: branches/ge_dyn_load/intern/audaspace/make/msvc_9_0/audaspace.vcproj === --- branches/ge_dyn_load/intern/audaspace/make/msvc_9_0/audaspace.vcproj 2009-09-25 16:43:11 UTC (rev 23491) +++ branches/ge_dyn_load/intern/audaspace/make/msvc_9_0/audaspace.vcproj 2009-09-25 16:57:30 UTC (rev 23492) @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="2" - AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include" + AdditionalIncludeDirectories="..\..;..\..\ffmpeg;..\..\FX;..\..\intern;..\..\OpenAL;..\..\SDL;..\..\SRC;..\..\sndfile;..\..\..\..\..\lib\windows\pthreads\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\..\lib\windows\sdl\include;..\..\..\..\..\lib\windows\openal\include;..\..\..\..\..\lib\windows\jack\include;..\..\..\..\..\lib\windows\sndfile\include" PreprocessorDefinitions="WIN32,NDEBUG,_LIB,WITH_FFMPEG,WITH_SDL,WITH_OPENAL" StringPooling="true" RuntimeLibrary="0" @@ -118,7 +118,7 @@ + + + + + + + + + + Modified: branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj === --- branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-09-25 16:43:11 UTC (rev 23491) +++ branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-09-25 16:57:30 UTC (rev 23492) @@ -295,6 +295,10 @@ > + + @@ -1372,6 +1376,10 @@ > + + @@ -1379,6 +1387,14 @@ RelativePath="..\..\..\source\blender\editors\gpencil\gpencil_intern.h" > + + + + + + + + + + Modified: branches/ge_dyn_load/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj === --- branches/ge_dyn_load/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj 200
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23491] branches/ge_dyn_load/source: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23484 :23490
Revision: 23491
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23491
Author: campbellbarton
Date: 2009-09-25 18:43:11 +0200 (Fri, 25 Sep 2009)
Log Message:
---
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23484:23490
Modified Paths:
--
branches/ge_dyn_load/source/blender/blenloader/BLO_readfile.h
branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c
branches/ge_dyn_load/source/blender/editors/space_graph/graph_draw.c
branches/ge_dyn_load/source/blender/editors/space_graph/graph_edit.c
branches/ge_dyn_load/source/blender/editors/space_graph/graph_ops.c
branches/ge_dyn_load/source/blender/editors/space_graph/graph_select.c
branches/ge_dyn_load/source/creator/CMakeLists.txt
branches/ge_dyn_load/source/gameengine/Converter/BL_ArmatureObject.h
branches/ge_dyn_load/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ge_dyn_load/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
Modified: branches/ge_dyn_load/source/blender/blenloader/BLO_readfile.h
===
--- branches/ge_dyn_load/source/blender/blenloader/BLO_readfile.h
2009-09-25 16:30:15 UTC (rev 23490)
+++ branches/ge_dyn_load/source/blender/blenloader/BLO_readfile.h
2009-09-25 16:43:11 UTC (rev 23491)
@@ -211,7 +211,7 @@
void BLO_library_append_end(const struct bContext *C, struct Main *mainl,
BlendHandle** bh, int idcode, short flag);
/* deprecated */
-#if 0
+#if 1
void BLO_script_library_append(BlendHandle **bh, char *dir, char *name, int
idcode, short flag, struct Main *mainvar, struct Scene *scene, struct
ReportList *reports);
#endif
Modified: branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c
===
--- branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c
2009-09-25 16:30:15 UTC (rev 23490)
+++ branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c
2009-09-25 16:43:11 UTC (rev 23491)
@@ -11057,7 +11057,7 @@
/* this should probably be moved into the Python code anyway */
/* tentatively removed, Python should be able to use the split functions too:
*/
/* BLO_library_append_begin, BLO_library_append_end,
BLO_library_append_named_part */
-#if 0
+#if 1
void BLO_script_library_append(BlendHandle **bh, char *dir, char *name,
int idcode, short flag, Main *mainvar, Scene *scene, ReportList
*reports)
{
Modified: branches/ge_dyn_load/source/blender/editors/space_graph/graph_draw.c
===
--- branches/ge_dyn_load/source/blender/editors/space_graph/graph_draw.c
2009-09-25 16:30:15 UTC (rev 23490)
+++ branches/ge_dyn_load/source/blender/editors/space_graph/graph_draw.c
2009-09-25 16:43:11 UTC (rev 23491)
@@ -91,26 +91,6 @@
extern void gl_round_box(int mode, float minx, float miny, float maxx, float
maxy, float rad);
/* *** */
-/* Utility Drawing Defines */
-
-/* determine the alpha value that should be used when
- * drawing components for some F-Curve (fcu)
- * - selected F-Curves should be more visible than partially visible ones
- */
-#define drawFCurveFade(fcu) ( ((fcu)->flag & FCURVE_SELECTED)? 1.0f : 0.5f )
-
-/* set the colour for some point from some value given packed into an int
- * - intV: integer value containing color info packed into an int
- * - alpha: float value describing the
- */
-#define cpackA(intVC, alpha) \
- { \
- float _cpackCol[3]; \
- cpack_to_rgb(intVC, &_cpackCol[0], &_cpackCol[1],
&_cpackCol[2]); \
- glColor4f(_cpackCol[0], _cpackCol[1], _cpackCol[2], alpha); \
- }
-
-/* *** */
/* F-Curve Modifier Drawing */
/* Envelope -- */
@@ -278,20 +258,22 @@
/* helper func - set color to draw F-Curve data with */
static void set_fcurve_vertex_color (SpaceIpo *sipo, FCurve *fcu, short sel)
{
- /* Fade the 'intensity' of the vertices based on the selection of the
curves too */
- int alphaOffset= (int)((drawFCurveFade(fcu) - 1.0f) * 255);
-
- /* Set color of curve vertex based on state of curve (i.e. 'Edit' Mode)
*/
- if ((fcu->flag & FCURVE_PROTECTED)==0) {
- /* Curve's points ARE BEING edited */
- if (sel) UI_ThemeColorShadeAlpha(TH_VERTEX_SELECT, 0,
alphaOffset);
- else UI_ThemeColorShadeAlpha(TH_VERTEX, 0, alphaOffset);
- }
- else {
- /* Curve's points CANNOT BE edited */
- if (sel) UI_ThemeColorShadeAlpha(TH_TEXT_HI, 0, alphaOffset);
- else UI_ThemeColorShadeAlpha(TH_TEXT, 0, alphaOffset);
- }
+#if 0
+ if (sipo->showkey) {
+ if (sel) UI_ThemeColor(TH_TEXT_HI);
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23490] trunk/blender/source/gameengine: almost all event managers stored a pointer back to the logic manager, easier if this pointer is in the base c
Revision: 23490
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23490
Author: campbellbarton
Date: 2009-09-25 18:30:15 +0200 (Fri, 25 Sep 2009)
Log Message:
---
almost all event managers stored a pointer back to the logic manager, easier if
this pointer is in the base class - SCA_EventManager
Modified Paths:
--
trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_BasicEventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_EventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_EventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.h
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.h
trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.h
trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
trunk/blender/source/gameengine/GameLogic/SCA_RandomEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
trunk/blender/source/gameengine/Ketsji/KX_RayEventManager.h
trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.cpp
trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.h
Modified: trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
===
--- trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -36,8 +36,7 @@
SCA_ActuatorEventManager::SCA_ActuatorEventManager(class SCA_LogicManager*
logicmgr)
- : SCA_EventManager(ACTUATOR_EVENTMGR),
- m_logicmgr(logicmgr)
+ : SCA_EventManager(logicmgr, ACTUATOR_EVENTMGR)
{
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
===
--- trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
2009-09-25 16:30:15 UTC (rev 23490)
@@ -37,8 +37,6 @@
class SCA_ActuatorEventManager : public SCA_EventManager
{
- class SCA_LogicManager* m_logicmgr;
-
public:
SCA_ActuatorEventManager(class SCA_LogicManager* logicmgr);
virtual ~SCA_ActuatorEventManager();
Modified: trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
===
--- trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -42,8 +42,7 @@
using namespace std;
SCA_AlwaysEventManager::SCA_AlwaysEventManager(class SCA_LogicManager*
logicmgr)
- : SCA_EventManager(ALWAYS_EVENTMGR),
- m_logicmgr(logicmgr)
+ : SCA_EventManager(logicmgr, ALWAYS_EVENTMGR)
{
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
===
--- trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
2009-09-25 16:30:15 UTC (rev 23490)
@@ -34,8 +34,6 @@
using namespace std;
class SCA_AlwaysEventManager : public SCA_EventManager
{
-
- class SCA_LogicManager* m_logicmgr;
public:
SCA_AlwaysEventManager(class SCA_LogicManager* logicmgr);
virtual void NextFrame();
Modified: trunk/blender/source/gameengine/GameLogic/SCA_BasicEventManager.cpp
===
--- trunk/blender/source/gameengine/GameLogic/SCA_BasicEventManager.cpp
2009-09-25 16:27:12 UTC (rev 23489)
+++ trunk/blender/source/gameengine/GameLogic/SCA_BasicEventManager.cpp
2009-09-25 16:30:15 UTC (rev 23490)
@@ -42,8 +42,7 @@
using namespace std;
SCA_BasicEventManager::SCA_BasicEventManag
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23489] trunk/blender/source/creator/ CMakeLists.txt: removed double library entries without realizing I had the BGE disabled, these are needed.
Revision: 23489 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23489 Author: campbellbarton Date: 2009-09-25 18:27:12 +0200 (Fri, 25 Sep 2009) Log Message: --- removed double library entries without realizing I had the BGE disabled, these are needed. Modified Paths: -- trunk/blender/source/creator/CMakeLists.txt Modified: trunk/blender/source/creator/CMakeLists.txt === --- trunk/blender/source/creator/CMakeLists.txt 2009-09-25 14:26:00 UTC (rev 23488) +++ trunk/blender/source/creator/CMakeLists.txt 2009-09-25 16:27:12 UTC (rev 23489) @@ -364,7 +364,7 @@ blender_ONL bf_python bf_gen_python - bf_ikplugin + bf_ikplugin bf_blenkernel bf_nodes bf_gpu @@ -379,12 +379,15 @@ bf_readblenfile blender_bop bf_kernel + bf_decimation bf_elbeem bf_IK bf_memutil bf_guardedalloc blender_CTR bf_moto + bf_windowmanager + bf_editors bf_blroutines bf_converter bf_dummy @@ -399,11 +402,18 @@ bf_oglrasterizer bf_expressions bf_scenegraph + bf_moto + bf_blroutines kx_network + bf_kernel bf_ngnetwork extern_bullet bf_loopbacknetwork - bf_ITASC + bf_ITASC + bf_common + bf_moto + bf_python + bf_gen_python extern_binreloc extern_glew extern_libopenjpeg ___ 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 [23488] trunk/blender/source/gameengine/ Converter/BL_ArmatureObject.h: WITH_CXX_GUARDEDALLOC was broken since BL_ArmatureObject become a PyObject
Revision: 23488
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23488
Author: campbellbarton
Date: 2009-09-25 16:26:00 +0200 (Fri, 25 Sep 2009)
Log Message:
---
WITH_CXX_GUARDEDALLOC was broken since BL_ArmatureObject become a PyObject
Modified Paths:
--
trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
===
--- trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
2009-09-25 13:09:18 UTC (rev 23487)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
2009-09-25 14:26:00 UTC (rev 23488)
@@ -134,13 +134,6 @@
float m_obmat[4][4];
double m_lastapplyframe;
-
-
-#ifdef WITH_CXX_GUARDEDALLOC
-public:
- void *operator new( unsigned int num_bytes) { return
MEM_mallocN(num_bytes, "GE:BL_ArmatureObject"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
-#endif
};
/* Pose function specific to the game engine */
___
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 [23487] trunk/blender/source/creator/ CMakeLists.txt: fix for buildinfo on mac's
Revision: 23487
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23487
Author: campbellbarton
Date: 2009-09-25 15:09:18 +0200 (Fri, 25 Sep 2009)
Log Message:
---
fix for buildinfo on mac's
Modified Paths:
--
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/source/creator/CMakeLists.txt
===
--- trunk/blender/source/creator/CMakeLists.txt 2009-09-25 12:57:55 UTC (rev
23486)
+++ trunk/blender/source/creator/CMakeLists.txt 2009-09-25 13:09:18 UTC (rev
23487)
@@ -24,6 +24,9 @@
#
# * END GPL LICENSE BLOCK *
+# So BUILDINFO and BLENDERPATH strings are automatically quoted
+CMAKE_POLICY(SET CMP0005 NEW)
+
SETUP_LIBDIRS()
INCLUDE_DIRECTORIES(../../intern/guardedalloc
@@ -68,7 +71,6 @@
IF(UNIX AND NOT APPLE)
SET(BLENDERPATH
${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
- CMAKE_POLICY(SET CMP0005 NEW)
# blender_path in creator.c
ADD_DEFINITIONS(-DBLENDERPATH="${BLENDERPATH}")
ENDIF(UNIX AND NOT APPLE)
___
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 [23485] trunk/blender/source/blender/ editors/space_graph: Graph Editor: F-Modifiers can now be added to multiple selected F-Curves at once with the C
Revision: 23485
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23485
Author: aligorith
Date: 2009-09-25 14:20:31 +0200 (Fri, 25 Sep 2009)
Log Message:
---
Graph Editor: F-Modifiers can now be added to multiple selected F-Curves at
once with the Ctrl-Shift-M hotkey.
* All the selected F-Curves will get the same type of F-Modifier added.
* The button in the properties region will still only added the F-Modifier to
the active F-Curve though
* For now, there must be an active F-Curve in either case, otherwise the poll()
callback fails.
Modified Paths:
--
trunk/blender/source/blender/editors/space_graph/graph_edit.c
trunk/blender/source/blender/editors/space_graph/graph_ops.c
Modified: trunk/blender/source/blender/editors/space_graph/graph_edit.c
===
--- trunk/blender/source/blender/editors/space_graph/graph_edit.c
2009-09-25 11:24:33 UTC (rev 23484)
+++ trunk/blender/source/blender/editors/space_graph/graph_edit.c
2009-09-25 12:20:31 UTC (rev 23485)
@@ -1710,13 +1710,18 @@
/* start from 1 to skip the 'Invalid' modifier type */
for (i = 1; i < FMODIFIER_NUM_TYPES; i++) {
FModifierTypeInfo *fmi= get_fmodifier_typeinfo(i);
+ PointerRNA props_ptr;
/* check if modifier is valid for this context */
if (fmi == NULL)
continue;
- /* add entry to add this type of modifier */
- uiItemEnumO(layout, fmi->name, 0, "GRAPH_OT_fmodifier_add",
"type", i);
+ /* create operator menu item with relevant properties filled in
*/
+ props_ptr= uiItemFullO(layout, fmi->name, 0,
"GRAPH_OT_fmodifier_add", NULL, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
+ /* the only thing that gets set from the menu is the
type of F-Modifier to add */
+ RNA_enum_set(&props_ptr, "type", i);
+ /* the following properties are just repeats of
existing ones... */
+ RNA_boolean_set(&props_ptr, "only_active",
RNA_boolean_get(op->ptr, "only_active"));
}
uiItemS(layout);
@@ -1728,36 +1733,41 @@
static int graph_fmodifier_add_exec(bContext *C, wmOperator *op)
{
bAnimContext ac;
+ ListBase anim_data = {NULL, NULL};
bAnimListElem *ale;
- FCurve *fcu;
- FModifier *fcm;
+ int filter;
short type;
/* get editor data */
if (ANIM_animdata_get_context(C, &ac) == 0)
return OPERATOR_CANCELLED;
-
- // xxx call the raw methods here instead?
- ale= get_active_fcurve_channel(&ac);
- if (ale == NULL)
- return OPERATOR_CANCELLED;
- fcu= (FCurve *)ale->data;
- MEM_freeN(ale);
- if (fcu == NULL)
- return OPERATOR_CANCELLED;
-
/* get type of modifier to add */
type= RNA_enum_get(op->ptr, "type");
- /* add F-Modifier of specified type to active F-Curve, and make it the
active one */
- fcm= add_fmodifier(&fcu->modifiers, type);
- if (fcm)
- set_active_fmodifier(&fcu->modifiers, fcm);
- else {
- BKE_report(op->reports, RPT_ERROR, "Modifier couldn't be added.
See console for details.");
- return OPERATOR_CANCELLED;
+ /* filter data */
+ filter= (ANIMFILTER_VISIBLE | ANIMFILTER_CURVEVISIBLE|
ANIMFILTER_FOREDIT | ANIMFILTER_CURVESONLY);
+ if (RNA_boolean_get(op->ptr, "only_active"))
+ filter |= ANIMFILTER_ACTIVE;
+ else
+ filter |= ANIMFILTER_SEL;
+ ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
+
+ /* smooth keyframes */
+ for (ale= anim_data.first; ale; ale= ale->next) {
+ FCurve *fcu= (FCurve *)ale->data;
+ FModifier *fcm;
+
+ /* add F-Modifier of specified type to active F-Curve, and make
it the active one */
+ fcm= add_fmodifier(&fcu->modifiers, type);
+ if (fcm)
+ set_active_fmodifier(&fcu->modifiers, fcm);
+ else { // TODO: stop when this happens?
+ BKE_report(op->reports, RPT_ERROR, "Modifier couldn't
be added. See console for details.");
+ break;
+ }
}
+ BLI_freelistN(&anim_data);
/* validate keyframes after editing */
ANIM_editkeyframes_refresh(&ac);
@@ -1786,6 +1796,7 @@
/* id-props */
RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, "Type", "");
+ RNA_def_boolean(ot->srna, "only_active", 1, "Only Active", "Only add
F-Modifier to active F-Curve.");
}
/* **
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23484] branches/ge_dyn_load: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23300 :23400
Revision: 23484 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23484 Author: campbellbarton Date: 2009-09-25 13:24:33 +0200 (Fri, 25 Sep 2009) Log Message: --- svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23300:23400 Modified Paths: -- branches/ge_dyn_load/CMakeLists.txt branches/ge_dyn_load/SConstruct branches/ge_dyn_load/config/darwin-config.py branches/ge_dyn_load/config/irix6-config.py branches/ge_dyn_load/config/linux2-config.py branches/ge_dyn_load/config/linuxcross-config.py branches/ge_dyn_load/config/openbsd3-config.py branches/ge_dyn_load/config/sunos5-config.py branches/ge_dyn_load/config/win32-mingw-config.py branches/ge_dyn_load/config/win32-vc-config.py branches/ge_dyn_load/config/win64-vc-config.py branches/ge_dyn_load/intern/audaspace/intern/AUD_C-API.cpp branches/ge_dyn_load/intern/audaspace/intern/AUD_C-API.h branches/ge_dyn_load/intern/ghost/GHOST_Types.h branches/ge_dyn_load/intern/ghost/intern/GHOST_SystemWin32.cpp branches/ge_dyn_load/intern/ghost/intern/GHOST_SystemX11.cpp branches/ge_dyn_load/intern/ghost/intern/GHOST_WindowX11.cpp branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj branches/ge_dyn_load/release/io/export_ply.py branches/ge_dyn_load/release/ui/buttons_data_armature.py branches/ge_dyn_load/release/ui/buttons_data_bone.py branches/ge_dyn_load/release/ui/buttons_data_mesh.py branches/ge_dyn_load/release/ui/buttons_game.py branches/ge_dyn_load/release/ui/buttons_object_constraint.py branches/ge_dyn_load/release/ui/buttons_particle.py branches/ge_dyn_load/release/ui/buttons_scene.py branches/ge_dyn_load/release/ui/space_console.py branches/ge_dyn_load/release/ui/space_image.py branches/ge_dyn_load/release/ui/space_info.py branches/ge_dyn_load/release/ui/space_time.py branches/ge_dyn_load/release/ui/space_userpref.py branches/ge_dyn_load/release/ui/space_view3d.py branches/ge_dyn_load/release/ui/space_view3d_toolbar.py branches/ge_dyn_load/source/blender/blenkernel/BKE_boids.h branches/ge_dyn_load/source/blender/blenkernel/BKE_brush.h branches/ge_dyn_load/source/blender/blenkernel/BKE_fcurve.h branches/ge_dyn_load/source/blender/blenkernel/BKE_particle.h branches/ge_dyn_load/source/blender/blenkernel/BKE_sound.h branches/ge_dyn_load/source/blender/blenkernel/intern/anim.c branches/ge_dyn_load/source/blender/blenkernel/intern/anim_sys.c branches/ge_dyn_load/source/blender/blenkernel/intern/boids.c branches/ge_dyn_load/source/blender/blenkernel/intern/brush.c branches/ge_dyn_load/source/blender/blenkernel/intern/cloth.c branches/ge_dyn_load/source/blender/blenkernel/intern/constraint.c branches/ge_dyn_load/source/blender/blenkernel/intern/curve.c branches/ge_dyn_load/source/blender/blenkernel/intern/depsgraph.c branches/ge_dyn_load/source/blender/blenkernel/intern/fcurve.c branches/ge_dyn_load/source/blender/blenkernel/intern/implicit.c branches/ge_dyn_load/source/blender/blenkernel/intern/modifier.c branches/ge_dyn_load/source/blender/blenkernel/intern/object.c branches/ge_dyn_load/source/blender/blenkernel/intern/particle.c branches/ge_dyn_load/source/blender/blenkernel/intern/particle_system.c branches/ge_dyn_load/source/blender/blenkernel/intern/pointcache.c branches/ge_dyn_load/source/blender/blenkernel/intern/scene.c branches/ge_dyn_load/source/blender/blenkernel/intern/sound.c branches/ge_dyn_load/source/blender/blenkernel/intern/text.c branches/ge_dyn_load/source/blender/blenkernel/intern/writeffmpeg.c branches/ge_dyn_load/source/blender/blenlib/BLI_arithb.h branches/ge_dyn_load/source/blender/blenlib/BLI_util.h branches/ge_dyn_load/source/blender/blenlib/intern/arithb.c branches/ge_dyn_load/source/blender/blenlib/intern/util.c branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c branches/ge_dyn_load/source/blender/blenloader/intern/writefile.c branches/ge_dyn_load/source/blender/editors/animation/anim_channels_defines.c branches/ge_dyn_load/source/blender/editors/animation/anim_channels_edit.c branches/ge_dyn_load/source/blender/editors/animation/anim_filter.c branches/ge_dyn_load/source/blender/editors/animation/anim_markers.c branches/ge_dyn_load/source/blender/editors/animation/anim_ops.c branches/ge_dyn_load/source/blender/editors/animation/keyframes_draw.c branches/ge_dyn_load/source/blender/editors/animation/keyframes_edit.c branches/ge_dyn_load/source/blender/editors/animation/keyframing.c branches/ge_dyn_load/source/blender/editors/armature/armature_intern.h branches/ge_dyn_load/source/blender/editors/armature/armature_ops.c branches/ge_dyn_load/source/blender/editors/armature/editarmature.c branches/ge_dyn_load/source/blender/e
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23483] branches/ge_dyn_load: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23200 :23300
Revision: 23483 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23483 Author: campbellbarton Date: 2009-09-25 12:59:36 +0200 (Fri, 25 Sep 2009) Log Message: --- svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23200:23300 Modified Paths: -- branches/ge_dyn_load/CMakeLists.txt branches/ge_dyn_load/extern/bullet2/src/Bullet-C-Api.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp branches/ge_dyn_load/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/ConstraintSol
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23482] trunk/blender/source/blender/ editors/space_graph: Graph Editor: Drawing + Selection Tweaks
Revision: 23482
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23482
Author: aligorith
Date: 2009-09-25 12:52:29 +0200 (Fri, 25 Sep 2009)
Log Message:
---
Graph Editor: Drawing + Selection Tweaks
* Deselect all now selects/deselects F-Curves too
* Tangents of unselected F-Curves now draw 'faded' like the curves they belong
to. This experimental change is quite subtle, but can be made stronger still if
people want.
* Cleaned up some old comments in the code too...
Modified Paths:
--
trunk/blender/source/blender/editors/space_graph/graph_draw.c
trunk/blender/source/blender/editors/space_graph/graph_select.c
Modified: trunk/blender/source/blender/editors/space_graph/graph_draw.c
===
--- trunk/blender/source/blender/editors/space_graph/graph_draw.c
2009-09-25 10:24:42 UTC (rev 23481)
+++ trunk/blender/source/blender/editors/space_graph/graph_draw.c
2009-09-25 10:52:29 UTC (rev 23482)
@@ -91,6 +91,26 @@
extern void gl_round_box(int mode, float minx, float miny, float maxx, float
maxy, float rad);
/* *** */
+/* Utility Drawing Defines */
+
+/* determine the alpha value that should be used when
+ * drawing components for some F-Curve (fcu)
+ * - selected F-Curves should be more visible than partially visible ones
+ */
+#define drawFCurveFade(fcu) ( ((fcu)->flag & FCURVE_SELECTED)? 1.0f : 0.5f )
+
+/* set the colour for some point from some value given packed into an int
+ * - intV: integer value containing color info packed into an int
+ * - alpha: float value describing the
+ */
+#define cpackA(intVC, alpha) \
+ { \
+ float _cpackCol[3]; \
+ cpack_to_rgb(intVC, &_cpackCol[0], &_cpackCol[1],
&_cpackCol[2]); \
+ glColor4f(_cpackCol[0], _cpackCol[1], _cpackCol[2], alpha); \
+ }
+
+/* *** */
/* F-Curve Modifier Drawing */
/* Envelope -- */
@@ -258,22 +278,20 @@
/* helper func - set color to draw F-Curve data with */
static void set_fcurve_vertex_color (SpaceIpo *sipo, FCurve *fcu, short sel)
{
-#if 0
- if (sipo->showkey) {
- if (sel) UI_ThemeColor(TH_TEXT_HI);
- else UI_ThemeColor(TH_TEXT);
- }
-#endif
- if ((fcu->flag & FCURVE_PROTECTED)==0) {
- /* Curve's points are being edited */
- if (sel) UI_ThemeColor(TH_VERTEX_SELECT);
- else UI_ThemeColor(TH_VERTEX);
- }
- else {
- /* Curve's points cannot be edited */
- if (sel) UI_ThemeColor(TH_TEXT_HI);
- else UI_ThemeColor(TH_TEXT);
- }
+ /* Fade the 'intensity' of the vertices based on the selection of the
curves too */
+ int alphaOffset= (int)((drawFCurveFade(fcu) - 1.0f) * 255);
+
+ /* Set color of curve vertex based on state of curve (i.e. 'Edit' Mode)
*/
+ if ((fcu->flag & FCURVE_PROTECTED)==0) {
+ /* Curve's points ARE BEING edited */
+ if (sel) UI_ThemeColorShadeAlpha(TH_VERTEX_SELECT, 0,
alphaOffset);
+ else UI_ThemeColorShadeAlpha(TH_VERTEX, 0, alphaOffset);
+ }
+ else {
+ /* Curve's points CANNOT BE edited */
+ if (sel) UI_ThemeColorShadeAlpha(TH_TEXT_HI, 0, alphaOffset);
+ else UI_ThemeColorShadeAlpha(TH_TEXT, 0, alphaOffset);
+ }
}
@@ -322,7 +340,7 @@
if ((sipo->flag & SIPO_NOHANDLES) || (fcu->flag & FCURVE_PROTECTED) ||
(fcu->flag & FCURVE_INT_VALUES))
return;
- /* slightly hacky, but we want to draw unselected points before
selected ones*/
+ /* slightly hacky, but we want to draw unselected points before
selected ones */
for (sel= 0; sel < 2; sel++) {
BezTriple *bezt=fcu->bezt, *prevbezt=NULL;
float *fp;
@@ -337,7 +355,7 @@
/* only draw first handle if previous segment
had handles */
if ( (!prevbezt && (bezt->ipo==BEZT_IPO_BEZ))
|| (prevbezt && (prevbezt->ipo==BEZT_IPO_BEZ)) )
{
- cpack(col[(unsigned char)bezt->h1]);
+ cpackA(col[(unsigned char)bezt->h1],
drawFCurveFade(fcu));
glBegin(GL_LINE_STRIP);
glVertex2fv(fp);
glVertex2fv(fp+3);
glEnd();
@@ -347,7 +365,7 @@
/* only draw second handle if this segment is
bezier */
if (bezt->ipo == BEZT_IPO_BEZ)
{
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23481] trunk/blender/source/blender/ editors/space_view3d: modal kaymaps for view3d rotate/move/ zoom removed redundant 'view' prefix from these oper
Revision: 23481
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23481
Author: campbellbarton
Date: 2009-09-25 12:24:42 +0200 (Fri, 25 Sep 2009)
Log Message:
---
modal kaymaps for view3d rotate/move/zoom removed redundant 'view' prefix from
these operators.
Modified Paths:
--
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2009-09-25 09:33:46 UTC (rev 23480)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2009-09-25 10:24:42 UTC (rev 23481)
@@ -239,9 +239,10 @@
float ofs[3], obofs[3];
float reverse, dist0;
float grid, far;
+ short axis_snap; /* view rotate only */
int origx, origy, oldx, oldy;
- int origkey;
+ int origkey; /* the key that triggered the operator */
} ViewOpsData;
@@ -289,7 +290,7 @@
QUATCOPY(vod->oldquat, rv3d->viewquat);
vod->origx= vod->oldx= event->x;
vod->origy= vod->oldy= event->y;
- vod->origkey= event->type;
+ vod->origkey= event->type; /* the key that triggered the operator. */
/* lookup, we dont pass on v3d to prevent confusement */
vod->grid= v3d->grid;
@@ -357,11 +358,52 @@
{0.0, 0.0, 0.0, 1.0, 0, 0}
};
+enum {
+ VIEW_PASS= 0,
+ VIEW_APPLY,
+ VIEW_CONFIRM
+};
-static void viewrotate_apply(ViewOpsData *vod, int x, int y, int ctrl)
+/* NOTE: these defines are saved in keymap files, do not change values but
just add new ones */
+#define VIEW_MODAL_CONFIRM 1 /* used for all view
operations */
+#define VIEWROT_MODAL_AXIS_SNAP_ENABLE 2
+#define VIEWROT_MODAL_AXIS_SNAP_DISABLE3
+
+
+/* called in transform_ops.c, on each regeneration of keymaps */
+void viewrotate_modal_keymap(wmWindowManager *wm)
{
+ static EnumPropertyItem modal_items[] = {
+ {VIEW_MODAL_CONFIRM,"CONFIRM", 0, "Cancel", ""},
+
+ {VIEWROT_MODAL_AXIS_SNAP_ENABLE,"AXIS_SNAP_ENABLE", 0, "Enable
Axis Snap", ""},
+ {VIEWROT_MODAL_AXIS_SNAP_DISABLE, "AXIS_SNAP_DISABLE", 0, "Enable
Axis Snap", ""},
+
+ {0, NULL, 0, NULL, NULL}};
+
+ wmKeyMap *keymap= WM_modalkeymap_get(wm, "View3D Rotate Modal");
+
+ /* this function is called for each spacetype, only needs to add map
once */
+ if(keymap) return;
+
+ keymap= WM_modalkeymap_add(wm, "View3D Rotate Modal", modal_items);
+
+ /* items for modal map */
+ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0,
VIEW_MODAL_CONFIRM);
+ WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0,
VIEW_MODAL_CONFIRM);
+
+ WM_modalkeymap_add_item(keymap, LEFTCTRLKEY, KM_PRESS, KM_ANY, 0,
VIEWROT_MODAL_AXIS_SNAP_ENABLE);
+ WM_modalkeymap_add_item(keymap, LEFTCTRLKEY, KM_RELEASE, KM_ANY, 0,
VIEWROT_MODAL_AXIS_SNAP_DISABLE);
+
+ /* assign map to operators */
+ WM_modalkeymap_assign(keymap, "VIEW3D_OT_rotate");
+
+}
+
+static void viewrotate_apply(ViewOpsData *vod, int x, int y)
+{
RegionView3D *rv3d= vod->rv3d;
- int use_sel= 0; /* XXX */
+ int use_sel= U.uiflag & USER_ORBIT_SELECTION;
rv3d->view= 0; /* need to reset everytime because of view snapping */
@@ -462,7 +504,7 @@
}
/* check for view snap */
- if (ctrl){
+ if (vod->axis_snap){
int i;
float viewmat[3][3];
@@ -496,23 +538,41 @@
static int viewrotate_modal(bContext *C, wmOperator *op, wmEvent *event)
{
ViewOpsData *vod= op->customdata;
+ short event_code= VIEW_PASS;
/* execute the events */
- switch(event->type) {
- case MOUSEMOVE:
- viewrotate_apply(vod, event->x, event->y, event->ctrl);
- break;
+ if(event->type==MOUSEMOVE) {
+ event_code= VIEW_APPLY;
+ }
+ else if(event->type==EVT_MODAL_MAP) {
+ switch (event->val) {
+ case VIEW_MODAL_CONFIRM:
+ event_code= VIEW_CONFIRM;
+ break;
+ case VIEWROT_MODAL_AXIS_SNAP_ENABLE:
+ vod->axis_snap= TRUE;
+ event_code= VIEW_APPLY;
+ break;
+ case VIEWROT_MODAL_AXIS_SNAP_DISABLE:
+ vod->axis_snap= FALSE;
+ event_code= VIEW_APPLY;
+ break;
+ }
+ }
+ else if(event->type==vod-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23480] trunk/blender: Warning fixes for ITASC.
Revision: 23480
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23480
Author: blendix
Date: 2009-09-25 11:33:46 +0200 (Fri, 25 Sep 2009)
Log Message:
---
Warning fixes for ITASC. Also, use instead of ,
it works everywhere.
Modified Paths:
--
trunk/blender/intern/itasc/Armature.cpp
trunk/blender/intern/itasc/Cache.cpp
trunk/blender/intern/itasc/ConstraintSet.cpp
trunk/blender/intern/itasc/CopyPose.cpp
trunk/blender/intern/itasc/WSDLSSolver.hpp
trunk/blender/intern/itasc/kdl/jacobian.cpp
trunk/blender/intern/itasc/kdl/treefksolverpos_recursive.cpp
trunk/blender/source/blender/ikplugin/intern/ikplugin_api.c
trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
Modified: trunk/blender/intern/itasc/Armature.cpp
===
--- trunk/blender/intern/itasc/Armature.cpp 2009-09-25 07:44:29 UTC (rev
23479)
+++ trunk/blender/intern/itasc/Armature.cpp 2009-09-25 09:33:46 UTC (rev
23480)
@@ -8,9 +8,7 @@
#include "Armature.hpp"
#include
#include
-#ifndef __STDC__
-#include
-#endif
+#include
namespace iTaSC {
@@ -37,9 +35,9 @@
m_newqKdl(),
m_qdotKdl(),
m_jac(NULL),
+ m_armlength(0.0),
m_jacsolver(NULL),
- m_fksolver(NULL),
- m_armlength(0.0)
+ m_fksolver(NULL)
{
}
@@ -119,6 +117,8 @@
values[1].id = value[1].id = ID_JOINT_RZ;
v_nr = 2;
break;
+ case Joint::None:
+ break;
}
}
@@ -734,6 +734,8 @@
case ACT_ALPHA:
pConstraint->values[i].alpha = value;
break;
+ default:
+ break;
}
}
} else {
@@ -755,6 +757,8 @@
case ACT_ALPHA:
pConstraint->values[i].alpha =
value;
break;
+ case ACT_NONE:
+ break;
}
}
}
Modified: trunk/blender/intern/itasc/Cache.cpp
===
--- trunk/blender/intern/itasc/Cache.cpp2009-09-25 07:44:29 UTC (rev
23479)
+++ trunk/blender/intern/itasc/Cache.cpp2009-09-25 09:33:46 UTC (rev
23480)
@@ -7,9 +7,7 @@
#include
#include
#include
-#ifndef __STDC__
-#include
-#endif
+#include
#include "Cache.hpp"
namespace iTaSC {
Modified: trunk/blender/intern/itasc/ConstraintSet.cpp
===
--- trunk/blender/intern/itasc/ConstraintSet.cpp2009-09-25 07:44:29 UTC
(rev 23479)
+++ trunk/blender/intern/itasc/ConstraintSet.cpp2009-09-25 09:33:46 UTC
(rev 23480)
@@ -12,13 +12,13 @@
ConstraintSet::ConstraintSet(unsigned int _nc,double accuracy,unsigned int
maximum_iterations):
m_nc(_nc),
+m_Cf(e_zero_matrix(m_nc,6)),
+m_Wy(e_scalar_vector(m_nc,1.0)),
+m_y(m_nc),m_ydot(e_zero_vector(m_nc)),m_chi(e_zero_vector(6)),
+m_S(6),m_temp(6),m_tdelta(6),
m_Jf(e_identity_matrix(6,6)),
-m_Cf(e_zero_matrix(m_nc,6)),
m_U(e_identity_matrix(6,6)),m_V(e_identity_matrix(6,6)),m_B(e_zero_matrix(6,6)),
m_Jf_inv(e_zero_matrix(6,6)),
-m_Wy(e_scalar_vector(m_nc,1.0)),
-m_chi(e_zero_vector(6)),m_y(m_nc),m_ydot(e_zero_vector(m_nc)),
-m_S(6),m_temp(6),m_tdelta(6),
m_internalPose(F_identity), m_externalPose(F_identity),
m_constraintCallback(NULL), m_constraintParam(NULL),
m_toggle(false),m_substep(false),
Modified: trunk/blender/intern/itasc/CopyPose.cpp
===
--- trunk/blender/intern/itasc/CopyPose.cpp 2009-09-25 07:44:29 UTC (rev
23479)
+++ trunk/blender/intern/itasc/CopyPose.cpp 2009-09-25 09:33:46 UTC (rev
23480)
@@ -21,7 +21,7 @@
{
m_maxerror = armlength/2.0;
m_outputControl = (control_output & CTL_ALL);
- int _nc = nBitsOn(m_outputControl);
+ unsigned int _nc = nBitsOn(m_outputControl);
if (!_nc)
return;
// reset the constraint set
@@ -284,7 +284,7 @@
void CopyPose::updateState(ConstraintValues* _values, ControlState* _state,
unsigned int mask, double timestep)
{
- int id = (mask == CTL_ROTATIONX) ? ID_ROTATIONX : ID_POSITIONX;
+ unsigned int id = (mask == CTL_ROTATIONX) ? ID_ROTATIONX : ID_POSITIONX;
ControlState::ControlValue* _yval;
ConstraintSingleValue* _data;
int i, j, k;
Modified: trunk/blender/intern/itasc/WSDLSSolve
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23479] trunk/blender/intern/itasc: Fix OSX compilation problem with malloc.h in itasc
Revision: 23479
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23479
Author: ben2610
Date: 2009-09-25 09:44:29 +0200 (Fri, 25 Sep 2009)
Log Message:
---
Fix OSX compilation problem with malloc.h in itasc
Modified Paths:
--
trunk/blender/intern/itasc/Armature.cpp
trunk/blender/intern/itasc/Cache.cpp
trunk/blender/intern/itasc/CopyPose.cpp
trunk/blender/intern/itasc/Distance.cpp
trunk/blender/intern/itasc/MovingFrame.cpp
Modified: trunk/blender/intern/itasc/Armature.cpp
===
--- trunk/blender/intern/itasc/Armature.cpp 2009-09-25 07:20:32 UTC (rev
23478)
+++ trunk/blender/intern/itasc/Armature.cpp 2009-09-25 07:44:29 UTC (rev
23479)
@@ -7,8 +7,10 @@
#include "Armature.hpp"
#include
+#include
+#ifndef __STDC__
#include
-#include
+#endif
namespace iTaSC {
Modified: trunk/blender/intern/itasc/Cache.cpp
===
--- trunk/blender/intern/itasc/Cache.cpp2009-09-25 07:20:32 UTC (rev
23478)
+++ trunk/blender/intern/itasc/Cache.cpp2009-09-25 07:44:29 UTC (rev
23479)
@@ -6,11 +6,12 @@
*/
#include
#include
+#include
+#ifndef __STDC__
#include
+#endif
#include "Cache.hpp"
-#include
-
namespace iTaSC {
CacheEntry::~CacheEntry()
Modified: trunk/blender/intern/itasc/CopyPose.cpp
===
--- trunk/blender/intern/itasc/CopyPose.cpp 2009-09-25 07:20:32 UTC (rev
23478)
+++ trunk/blender/intern/itasc/CopyPose.cpp 2009-09-25 07:44:29 UTC (rev
23479)
@@ -8,7 +8,6 @@
#include "CopyPose.hpp"
#include "kdl/kinfam_io.hpp"
#include
-#include
#include
namespace iTaSC
Modified: trunk/blender/intern/itasc/Distance.cpp
===
--- trunk/blender/intern/itasc/Distance.cpp 2009-09-25 07:20:32 UTC (rev
23478)
+++ trunk/blender/intern/itasc/Distance.cpp 2009-09-25 07:44:29 UTC (rev
23479)
@@ -8,7 +8,6 @@
#include "Distance.hpp"
#include "kdl/kinfam_io.hpp"
#include
-#include
#include
namespace iTaSC
Modified: trunk/blender/intern/itasc/MovingFrame.cpp
===
--- trunk/blender/intern/itasc/MovingFrame.cpp 2009-09-25 07:20:32 UTC (rev
23478)
+++ trunk/blender/intern/itasc/MovingFrame.cpp 2009-09-25 07:44:29 UTC (rev
23479)
@@ -6,7 +6,6 @@
*/
#include "MovingFrame.hpp"
-#include
#include
namespace iTaSC{
___
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 [23478] branches/ge_dyn_load: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22999 :23200
Revision: 23478 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23478 Author: campbellbarton Date: 2009-09-25 09:20:32 +0200 (Fri, 25 Sep 2009) Log Message: --- svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22999:23200 Modified Paths: -- branches/ge_dyn_load/CMakeLists.txt branches/ge_dyn_load/SConstruct branches/ge_dyn_load/extern/CMakeLists.txt branches/ge_dyn_load/extern/Makefile branches/ge_dyn_load/extern/binreloc/SConscript branches/ge_dyn_load/extern/bullet2/CMakeLists.txt branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CMakeLists.txt branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/CMakeLists.txt branches/ge_dyn_load/extern/bullet2/src/SConscript branches/ge_dyn_load/extern/glew/CMakeLists.txt branches/ge_dyn_load/extern/glew/SConscript branches/ge_dyn_load/extern/libopenjpeg/SConscript branches/ge_dyn_load/intern/CMakeLists.txt branches/ge_dyn_load/intern/audaspace/CMakeLists.txt branches/ge_dyn_load/intern/audaspace/FX/AUD_DoubleReader.cpp branches/ge_dyn_load/intern/audaspace/FX/AUD_PingPongFactory.cpp branches/ge_dyn_load/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp branches/ge_dyn_load/intern/audaspace/SConscript branches/ge_dyn_load/intern/audaspace/SDL/AUD_SDLMixerReader.cpp branches/ge_dyn_load/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp branches/ge_dyn_load/intern/audaspace/intern/AUD_C-API.cpp branches/ge_dyn_load/intern/audaspace/jack/AUD_JackDevice.cpp branches/ge_dyn_load/intern/elbeem/CMakeLists.txt branches/ge_dyn_load/intern/ghost/CMakeLists.txt branches/ge_dyn_load/intern/ghost/SConscript branches/ge_dyn_load/intern/guardedalloc/CMakeLists.txt branches/ge_dyn_load/intern/guardedalloc/SConscript branches/ge_dyn_load/intern/iksolver/SConscript branches/ge_dyn_load/intern/iksolver/intern/TNT/tntmath.h branches/ge_dyn_load/intern/memutil/SConscript branches/ge_dyn_load/intern/moto/SConscript branches/ge_dyn_load/intern/smoke/CMakeLists.txt branches/ge_dyn_load/intern/smoke/extern/smoke_API.h branches/ge_dyn_load/intern/smoke/intern/FLUID_3D.cpp branches/ge_dyn_load/intern/smoke/intern/FLUID_3D.h branches/ge_dyn_load/intern/smoke/intern/FLUID_3D_STATIC.cpp branches/ge_dyn_load/intern/smoke/intern/WTURBULENCE.cpp branches/ge_dyn_load/intern/smoke/intern/WTURBULENCE.h branches/ge_dyn_load/intern/smoke/intern/smoke_API.cpp branches/ge_dyn_load/intern/smoke/intern/tnt/tnt_math_utils.h branches/ge_dyn_load/intern/string/SConscript branches/ge_dyn_load/intern/string/STR_String.h branches/ge_dyn_load/projectfiles_vc9/blender/blender.vcproj branches/ge_dyn_load/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj branches/ge_dyn_load/projectfiles_vc9/blender/gpu/BL_gpu.vcproj branches/ge_dyn_load/projectfiles_vc9/blender/loader/BLO_loader.vcproj branches/ge_dyn_load/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj branches/ge_dyn_load/projectfiles_vc9/blender/nodes/nodes.vcproj branches/ge_dyn_load/release/datafiles/blenderbuttons branches/ge_dyn_load/release/io/engine_render_pov.py branches/ge_dyn_load/release/io/export_ply.py branches/ge_dyn_load/release/ui/buttons_data_armature.py branches/ge_dyn_load/release/ui/buttons_data_bone.py branches/ge_dyn_load/release/ui/buttons_data_curve.py branches/ge_dyn_load/release/ui/buttons_data_empty.py branches/ge_dyn_load/release/ui/buttons_data_modifier.py branches/ge_dyn_load/release/ui/buttons_data_text.py branches/ge_dyn_load/release/ui/buttons_object_constraint.py branches/ge_dyn_load/release/ui/buttons_particle.py branches/ge_dyn_load/release/ui/buttons_physics_smoke.py branches/ge_dyn_load/release/ui/space_console.py branches/ge_dyn_load/release/ui/space_image.py branches/ge_dyn_load/release/ui/space_info.py branches/ge_dyn_load/release/ui/space_sequencer.py branches/ge_dyn_load/release/ui/space_userpref.py branches/ge_dyn_load/release/ui/space_view3d.py branches/ge_dyn_load/release/ui/space_view3d_toolbar.py branches/ge_dyn_load/scons/scons-LICENSE branches/ge_dyn_load/scons/scons-README branches/ge_dyn_load/scons/scons-time.py branches/ge_dyn_load/scons/scons.py branches/ge_dyn_load/scons/sconsign.py branches/ge_dyn_load/source/CMakeLists.txt branches/ge_dyn_load/source/Makefile branches/ge_dyn_load/source/blender/CMakeLists.txt branches/ge_dyn_load/source/blender/avi/CMakeLists.txt branches/ge_dyn_load/source/blender/avi/SConscript branches/ge_dyn_load/source/blender/blenfont/CMakeLists.txt branches/ge_dyn_load/source/blender/blenfont/SConscript branches/ge_dyn_load/source/blender/blenkernel/BKE_anim.h branches/ge_dyn_load/source/bl
