[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28302] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28283 :28301
Campbell Barton
ideasman42 at gmail.com
Tue Apr 20 12:38:15 CEST 2010
Revision: 28302
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28302
Author: campbellbarton
Date: 2010-04-20 12:38:15 +0200 (Tue, 20 Apr 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28283:28301
Modified Paths:
--------------
branches/render25/intern/iksolver/intern/IK_QSegment.cpp
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/screen/screen_ops.c
branches/render25/source/blender/editors/space_file/file_draw.c
branches/render25/source/blender/editors/space_file/file_ops.c
branches/render25/source/blender/editors/space_file/space_file.c
branches/render25/source/blender/makesrna/intern/rna_wm.c
branches/render25/source/blender/python/generic/mathutils_color.c
branches/render25/source/blender/python/generic/mathutils_euler.c
branches/render25/source/blender/python/generic/mathutils_matrix.c
branches/render25/source/blender/python/generic/mathutils_quat.c
branches/render25/source/blender/python/generic/mathutils_vector.c
branches/render25/source/blender/python/intern/bpy_rna.c
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/blender/windowmanager/wm_event_types.h
branches/render25/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/render25/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/render25/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/render25/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
branches/render25/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
branches/render25/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
branches/render25/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/render25/source/gameengine/PyDoc/GameKeys.py
branches/render25/source/gameengine/PyDoc/GameLogic.py
branches/render25/source/gameengine/PyDoc/GameTypes.py
branches/render25/source/gameengine/PyDoc/PhysicsConstraints.py
branches/render25/source/gameengine/PyDoc/VideoTexture.py
Modified: branches/render25/intern/iksolver/intern/IK_QSegment.cpp
===================================================================
--- branches/render25/intern/iksolver/intern/IK_QSegment.cpp 2010-04-20 10:36:00 UTC (rev 28301)
+++ branches/render25/intern/iksolver/intern/IK_QSegment.cpp 2010-04-20 10:38:15 UTC (rev 28302)
@@ -28,9 +28,6 @@
*/
#include "IK_QSegment.h"
-#ifdef WIN32
-#define _USE_MATH_DEFINES
-#endif
#include <cmath>
// Utility functions
@@ -372,8 +369,8 @@
return;
if (axis == 1) {
- lmin = MT_clamp(lmin, -M_PI, M_PI);
- lmax = MT_clamp(lmax, -M_PI, M_PI);
+ lmin = MT_clamp(lmin, -MT_PI, MT_PI);
+ lmax = MT_clamp(lmax, -MT_PI, MT_PI);
m_min_y = lmin;
m_max_y = lmax;
@@ -382,8 +379,8 @@
}
else {
// clamp and convert to axis angle parameters
- lmin = MT_clamp(lmin, -M_PI, M_PI);
- lmax = MT_clamp(lmax, -M_PI, M_PI);
+ lmin = MT_clamp(lmin, -MT_PI, MT_PI);
+ lmax = MT_clamp(lmax, -MT_PI, MT_PI);
lmin = sin(lmin*0.5);
lmax = sin(lmax*0.5);
@@ -615,8 +612,8 @@
return;
// clamp and convert to axis angle parameters
- lmin = MT_clamp(lmin, -M_PI, M_PI);
- lmax = MT_clamp(lmax, -M_PI, M_PI);
+ lmin = MT_clamp(lmin, -MT_PI, MT_PI);
+ lmax = MT_clamp(lmax, -MT_PI, MT_PI);
m_min = lmin;
m_max = lmax;
@@ -754,8 +751,8 @@
return;
// clamp and convert to axis angle parameters
- lmin = MT_clamp(lmin, -M_PI, M_PI);
- lmax = MT_clamp(lmax, -M_PI, M_PI);
+ lmin = MT_clamp(lmin, -MT_PI, MT_PI);
+ lmax = MT_clamp(lmax, -MT_PI, MT_PI);
lmin = sin(lmin*0.5);
lmax = sin(lmax*0.5);
@@ -900,8 +897,8 @@
return;
// clamp and convert to axis angle parameters
- lmin = MT_clamp(lmin, -M_PI, M_PI);
- lmax = MT_clamp(lmax, -M_PI, M_PI);
+ lmin = MT_clamp(lmin, -MT_PI, MT_PI);
+ lmax = MT_clamp(lmax, -MT_PI, MT_PI);
lmin = lmin;
lmax = lmax;
Modified: branches/render25/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.c 2010-04-20 10:36:00 UTC (rev 28301)
+++ branches/render25/source/blender/blenloader/intern/readfile.c 2010-04-20 10:38:15 UTC (rev 28302)
@@ -12300,7 +12300,29 @@
BKE_reportf(basefd->reports, RPT_INFO, "read library: '%s', '%s'\n", mainptr->curlib->filename, mainptr->curlib->name);
fd= blo_openblenderfile(mainptr->curlib->filename, basefd->reports);
+
+ /* allow typing in a new lib path */
+ if(G.rt==-666) {
+ while(fd==NULL) {
+ char newlib_path[240] = { 0 };
+ printf("Missing library: '%s', '%s'\n", mainptr->name, G.sce);
+ printf(" abs: %s\n", mainptr->curlib->filename);
+ printf(" rel: %s\n", mainptr->curlib->name);
+ printf(" enter a new path:\n");
+ scanf("%s", newlib_path);
+ strcpy(mainptr->curlib->name, newlib_path);
+ strcpy(mainptr->curlib->filename, newlib_path);
+ cleanup_path(G.sce, mainptr->curlib->filename);
+
+ fd= blo_openblenderfile(mainptr->curlib->filename, basefd->reports);
+
+ if(fd) {
+ print("found: '%s', party on macuno!\n");
+ }
+ }
+ }
+
if (fd) {
fd->reports= basefd->reports;
Modified: branches/render25/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/render25/source/blender/editors/screen/screen_ops.c 2010-04-20 10:36:00 UTC (rev 28301)
+++ branches/render25/source/blender/editors/screen/screen_ops.c 2010-04-20 10:38:15 UTC (rev 28302)
@@ -2561,7 +2561,7 @@
return OPERATOR_FINISHED;
}
-static int screen_animation_play_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int screen_animation_play_exec(bContext *C, wmOperator *op)
{
int mode= (RNA_boolean_get(op->ptr, "reverse")) ? -1 : 1;
int sync= -1;
@@ -2580,7 +2580,7 @@
ot->idname= "SCREEN_OT_animation_play";
/* api callbacks */
- ot->invoke= screen_animation_play_invoke;
+ ot->exec= screen_animation_play_exec;
ot->poll= ED_operator_screenactive;
@@ -2588,7 +2588,7 @@
RNA_def_boolean(ot->srna, "sync", 0, "Sync", "Drop frames to maintain framerate");
}
-static int screen_animation_cancel(bContext *C, wmOperator *op, wmEvent *event)
+static int screen_animation_cancel_exec(bContext *C, wmOperator *op)
{
bScreen *screen= CTX_wm_screen(C);
@@ -2617,7 +2617,7 @@
ot->idname= "SCREEN_OT_animation_cancel";
/* api callbacks */
- ot->invoke= screen_animation_cancel;
+ ot->exec= screen_animation_cancel_exec;
ot->poll= ED_operator_screenactive;
}
Modified: branches/render25/source/blender/editors/space_file/file_draw.c
===================================================================
--- branches/render25/source/blender/editors/space_file/file_draw.c 2010-04-20 10:36:00 UTC (rev 28301)
+++ branches/render25/source/blender/editors/space_file/file_draw.c 2010-04-20 10:38:15 UTC (rev 28302)
@@ -78,10 +78,6 @@
/* button events */
enum {
- B_REDR = 0,
- B_FS_EXEC,
- B_FS_CANCEL,
- B_FS_PARENT,
B_FS_DIRNAME,
B_FS_FILENAME
} eFile_ButEvents;
@@ -90,9 +86,6 @@
static void do_file_buttons(bContext *C, void *arg, int event)
{
switch(event) {
- case B_FS_PARENT:
- file_parent_exec(C, NULL); /* file_ops.c */
- break;
case B_FS_FILENAME:
file_filename_exec(C, NULL);
break;
Modified: branches/render25/source/blender/editors/space_file/file_ops.c
===================================================================
--- branches/render25/source/blender/editors/space_file/file_ops.c 2010-04-20 10:36:00 UTC (rev 28301)
+++ branches/render25/source/blender/editors/space_file/file_ops.c 2010-04-20 10:38:15 UTC (rev 28302)
@@ -121,7 +121,7 @@
}
}
-static FileSelect file_select(bContext* C, const rcti* rect, short selecting, short toggle_one)
+static FileSelect file_select(bContext* C, const rcti* rect, short selecting, short toggle_one, short fill)
{
ARegion *ar= CTX_wm_region(C);
SpaceFile *sfile= CTX_wm_space_file(C);
@@ -141,6 +141,19 @@
clamp_to_filelist(numfiles, &first_file, &last_file);
+ if (fill && (last_file >= 0) && (last_file < numfiles) ) {
+ int f= last_file;
+ while (f >= 0) {
+ struct direntry* file = filelist_file(sfile->files, f);
+ if (file->flags & ACTIVEFILE)
+ break;
+ f--;
+ }
+ if (f >= 0) {
+ first_file = f+1;
+ }
+ }
+
/* select all valid files between first and last indicated */
if ( (first_file >= 0) && (first_file < numfiles) && (last_file >= 0) && (last_file < numfiles) ) {
for (act_file = first_file; act_file <= last_file; act_file++) {
@@ -213,7 +226,7 @@
BLI_isect_rcti(&(ar->v2d.mask), &rect, &rect);
- if (FILE_SELECT_DIR == file_select(C, &rect, selecting, 0)) {
+ if (FILE_SELECT_DIR == file_select(C, &rect, selecting, 0, 0)) {
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
} else {
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
@@ -245,6 +258,7 @@
short val;
rcti rect;
int extend = RNA_boolean_get(op->ptr, "extend");
+ int fill = RNA_boolean_get(op->ptr, "fill");
if(ar->regiontype != RGN_TYPE_WINDOW)
return OPERATOR_CANCELLED;
@@ -259,7 +273,7 @@
/* single select, deselect all selected first */
if (!extend) file_deselect_all(sfile);
- if (FILE_SELECT_DIR == file_select(C, &rect, 1, extend ))
+ if (FILE_SELECT_DIR == file_select(C, &rect, 1, extend, fill ))
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
else
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
@@ -283,6 +297,7 @@
/* rna */
RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first.");
+ RNA_def_boolean(ot->srna, "fill", 0, "Fill", "Select everything beginning with the last selection.");
}
static int file_select_all_exec(bContext *C, wmOperator *op)
@@ -657,8 +672,10 @@
int file_refresh_exec(bContext *C, wmOperator *unused)
{
- file_change_dir(C, 1);
+ SpaceFile *sfile= CTX_wm_space_file(C);
+ ED_fileselect_clear(C, sfile);
+
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
return OPERATOR_FINISHED;
Modified: branches/render25/source/blender/editors/space_file/space_file.c
===================================================================
--- branches/render25/source/blender/editors/space_file/space_file.c 2010-04-20 10:36:00 UTC (rev 28301)
+++ branches/render25/source/blender/editors/space_file/space_file.c 2010-04-20 10:38:15 UTC (rev 28302)
@@ -374,9 +374,12 @@
/* keys for main area */
keymap= WM_keymap_find(keyconf, "File Browser Main", SPACE_FILE, 0);
WM_keymap_add_item(keymap, "FILE_OT_select_execute", LEFTMOUSE, KM_DBL_CLICK, 0, 0);
- WM_keymap_add_item(keymap, "FILE_OT_select", LEFTMOUSE, KM_CLICK, 0, 0);
- kmi = WM_keymap_add_item(keymap, "FILE_OT_select", LEFTMOUSE, KM_CLICK, KM_SHIFT, 0);
+ WM_keymap_add_item(keymap, "FILE_OT_select", LEFTMOUSE, KM_PRESS, 0, 0);
+ kmi = WM_keymap_add_item(keymap, "FILE_OT_select", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
RNA_boolean_set(kmi->ptr, "extend", 1);
+ kmi = WM_keymap_add_item(keymap, "FILE_OT_select", LEFTMOUSE, KM_PRESS, KM_ALT, 0);
+ RNA_boolean_set(kmi->ptr, "extend", 1);
+ RNA_boolean_set(kmi->ptr, "fill", 1);
WM_keymap_add_item(keymap, "FILE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "FILE_OT_select_border", BKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "FILE_OT_select_border", EVT_TWEAK_L, KM_ANY, 0, 0);
Modified: branches/render25/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_wm.c 2010-04-20 10:36:00 UTC (rev 28301)
+++ branches/render25/source/blender/makesrna/intern/rna_wm.c 2010-04-20 10:38:15 UTC (rev 28302)
@@ -226,6 +226,13 @@
{F10KEY, "F10", 0, "F10", ""},
{F11KEY, "F11", 0, "F11", ""},
{F12KEY, "F12", 0, "F12", ""},
+ {F13KEY, "F13", 0, "F13", ""},
+ {F14KEY, "F14", 0, "F14", ""},
+ {F15KEY, "F15", 0, "F15", ""},
+ {F16KEY, "F16", 0, "F16", ""},
+ {F17KEY, "F17", 0, "F17", ""},
+ {F18KEY, "F18", 0, "F18", ""},
+ {F19KEY, "F19", 0, "F19", ""},
{PAUSEKEY, "PAUSE", 0, "Pause", ""},
{INSERTKEY, "INSERT", 0, "Insert", ""},
{HOMEKEY, "HOME", 0, "Home", ""},
Modified: branches/render25/source/blender/python/generic/mathutils_color.c
===================================================================
--- branches/render25/source/blender/python/generic/mathutils_color.c 2010-04-20 10:36:00 UTC (rev 28301)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list