[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27889] branches/render25/source/blender: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27859 :27864
Campbell Barton
ideasman42 at gmail.com
Wed Mar 31 08:49:57 CEST 2010
Revision: 27889
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27889
Author: campbellbarton
Date: 2010-03-31 08:49:54 +0200 (Wed, 31 Mar 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27859:27864
Modified Paths:
--------------
branches/render25/source/blender/editors/animation/anim_markers.c
branches/render25/source/blender/editors/interface/interface_regions.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/filelist.c
branches/render25/source/blender/editors/space_file/filesel.c
branches/render25/source/blender/editors/space_image/image_buttons.c
branches/render25/source/blender/editors/transform/transform_generics.c
branches/render25/source/blender/makesdna/DNA_space_types.h
Modified: branches/render25/source/blender/editors/animation/anim_markers.c
===================================================================
--- branches/render25/source/blender/editors/animation/anim_markers.c 2010-03-31 05:44:21 UTC (rev 27888)
+++ branches/render25/source/blender/editors/animation/anim_markers.c 2010-03-31 06:49:54 UTC (rev 27889)
@@ -61,6 +61,7 @@
#include "ED_util.h"
#include "ED_numinput.h"
#include "ED_object.h"
+#include "ED_types.h"
/* ************* Marker API **************** */
Modified: branches/render25/source/blender/editors/interface/interface_regions.c
===================================================================
--- branches/render25/source/blender/editors/interface/interface_regions.c 2010-03-31 05:44:21 UTC (rev 27888)
+++ branches/render25/source/blender/editors/interface/interface_regions.c 2010-03-31 06:49:54 UTC (rev 27889)
@@ -1575,6 +1575,7 @@
}
else if(strcmp(bt->str, "Hex: ")==0) {
float rgb_gamma[3];
+ double intpart;
char col[16];
/* Hex code is assumed to be in sRGB space (coming from other applications, web, etc) */
@@ -1586,6 +1587,10 @@
linearrgb_to_srgb_v3_v3(rgb_gamma, rgb);
}
+ if (rgb_gamma[0] > 1.0f) rgb_gamma[0] = modf(rgb_gamma[0], &intpart);
+ if (rgb_gamma[1] > 1.0f) rgb_gamma[1] = modf(rgb_gamma[1], &intpart);
+ if (rgb_gamma[2] > 1.0f) rgb_gamma[2] = modf(rgb_gamma[2], &intpart);
+
sprintf(col, "%02X%02X%02X", (unsigned int)(rgb_gamma[0]*255.0), (unsigned int)(rgb_gamma[1]*255.0), (unsigned int)(rgb_gamma[2]*255.0));
strcpy(bt->poin, col);
Modified: branches/render25/source/blender/editors/space_file/file_draw.c
===================================================================
--- branches/render25/source/blender/editors/space_file/file_draw.c 2010-03-31 05:44:21 UTC (rev 27888)
+++ branches/render25/source/blender/editors/space_file/file_draw.c 2010-03-31 06:49:54 UTC (rev 27889)
@@ -542,10 +542,10 @@
if (!(file->flags & EDITING)) {
if (params->active_file == i) {
- if (file->flags & ACTIVE) colorid= TH_HILITE;
+ if (file->flags & ACTIVEFILE) colorid= TH_HILITE;
else colorid = TH_BACK;
draw_tile(sx, sy-1, layout->tile_w+4, sfile->layout->tile_h+layout->tile_border_y, colorid,20);
- } else if (file->flags & ACTIVE) {
+ } else if (file->flags & ACTIVEFILE) {
colorid = TH_HILITE;
draw_tile(sx, sy-1, layout->tile_w+4, sfile->layout->tile_h+layout->tile_border_y, colorid,0);
}
Modified: branches/render25/source/blender/editors/space_file/file_ops.c
===================================================================
--- branches/render25/source/blender/editors/space_file/file_ops.c 2010-03-31 05:44:21 UTC (rev 27888)
+++ branches/render25/source/blender/editors/space_file/file_ops.c 2010-03-31 06:49:54 UTC (rev 27889)
@@ -59,7 +59,7 @@
#include <stdio.h>
/* for events */
-#define NOTACTIVE 0
+#define NOTACTIVEFILE 0
#define ACTIVATE 1
#define INACTIVATE 2
@@ -86,8 +86,8 @@
for ( i=0; i < numfiles; ++i) {
struct direntry* file = filelist_file(sfile->files, i);
- if (file && (file->flags & ACTIVE)) {
- file->flags &= ~ACTIVE;
+ if (file && (file->flags & ACTIVEFILE)) {
+ file->flags &= ~ACTIVEFILE;
}
}
}
@@ -135,7 +135,7 @@
int numfiles = filelist_numfiles(sfile->files);
- params->selstate = NOTACTIVE;
+ params->selstate = NOTACTIVEFILE;
first_file = find_file_mouse(sfile, ar, 1, rect->xmin, rect->ymax);
last_file = find_file_mouse(sfile, ar, 1, rect->xmax, rect->ymin);
@@ -147,15 +147,15 @@
struct direntry* file = filelist_file(sfile->files, act_file);
if (toggle_one) {
- if (file->flags & ACTIVE) {
- file->flags &= ~ACTIVE;
+ if (file->flags & ACTIVEFILE) {
+ file->flags &= ~ACTIVEFILE;
selecting=0;
} else
- file->flags |= ACTIVE;
+ file->flags |= ACTIVEFILE;
} else if (selecting)
- file->flags |= ACTIVE;
+ file->flags |= ACTIVEFILE;
else
- file->flags &= ~ACTIVE;
+ file->flags &= ~ACTIVEFILE;
}
}
@@ -296,8 +296,8 @@
/* if any file is selected, deselect all first */
for ( i=0; i < numfiles; ++i) {
struct direntry* file = filelist_file(sfile->files, i);
- if (file && (file->flags & ACTIVE)) {
- file->flags &= ~ACTIVE;
+ if (file && (file->flags & ACTIVEFILE)) {
+ file->flags &= ~ACTIVEFILE;
select = 0;
ED_area_tag_redraw(sa);
}
@@ -307,7 +307,7 @@
for ( i=0; i < numfiles; ++i) {
struct direntry* file = filelist_file(sfile->files, i);
if(file && !S_ISDIR(file->type)) {
- file->flags |= ACTIVE;
+ file->flags |= ACTIVEFILE;
ED_area_tag_redraw(sa);
}
}
@@ -543,7 +543,7 @@
for (i=0; i<filelist_numfiles(sfile->files); i++) {
file = filelist_file(sfile->files, i);
- if(file->flags & ACTIVE) {
+ if(file->flags & ACTIVEFILE) {
active=1;
}
}
@@ -571,7 +571,7 @@
if(RNA_struct_find_property(op->ptr, "files")) {
for (i=0; i<numfiles; i++) {
file = filelist_file(sfile->files, i);
- if(file->flags & ACTIVE) {
+ if(file->flags & ACTIVEFILE) {
if ((file->type & S_IFDIR)==0) {
RNA_collection_add(op->ptr, "files", &itemptr);
RNA_string_set(&itemptr, "name", file->relname);
@@ -583,7 +583,7 @@
if(RNA_struct_find_property(op->ptr, "dirs")) {
for (i=0; i<numfiles; i++) {
file = filelist_file(sfile->files, i);
- if(file->flags & ACTIVE) {
+ if(file->flags & ACTIVEFILE) {
if ((file->type & S_IFDIR)) {
RNA_collection_add(op->ptr, "dirs", &itemptr);
RNA_string_set(&itemptr, "name", file->relname);
Modified: branches/render25/source/blender/editors/space_file/filelist.c
===================================================================
--- branches/render25/source/blender/editors/space_file/filelist.c 2010-03-31 05:44:21 UTC (rev 27888)
+++ branches/render25/source/blender/editors/space_file/filelist.c 2010-03-31 06:49:54 UTC (rev 27889)
@@ -90,15 +90,9 @@
#include "filelist.h"
-/* Elubie: VERY, really very ugly and evil! Remove asap!!! */
-/* for state of file */
-#define ACTIVE 2
-
/* max length of library group name within filesel */
#define GROUP_MAX 32
-static void *exec_loadimages(void *list_v);
-
struct FileList;
typedef struct FileImage {
@@ -977,15 +971,15 @@
file= filelist->filelist;
for(num=0; num<filelist->numfiles; num++, file++) {
- if(file->flags & ACTIVE) {
+ if(file->flags & ACTIVEFILE) {
act= 1;
break;
}
}
file= filelist->filelist+2;
for(num=2; num<filelist->numfiles; num++, file++) {
- if(act) file->flags &= ~ACTIVE;
- else file->flags |= ACTIVE;
+ if(act) file->flags &= ~ACTIVEFILE;
+ else file->flags |= ACTIVEFILE;
}
}
@@ -1223,10 +1217,10 @@
#if 0 // XXXXX TODO show the selection status of the objects
if(!filelist->has_func) { /* F4 DATA BROWSE */
if(idcode==ID_OB) {
- if( ((Object *)id)->flag & SELECT) files->flags |= ACTIVE;
+ if( ((Object *)id)->flag & SELECT) files->flags |= ACTIVEFILE;
}
else if(idcode==ID_SCE) {
- if( ((Scene *)id)->r.scemode & R_BG_RENDER) files->flags |= ACTIVE;
+ if( ((Scene *)id)->r.scemode & R_BG_RENDER) files->flags |= ACTIVEFILE;
}
}
#endif
@@ -1367,4 +1361,4 @@
void thumbnails_stop(struct FileList* filelist, const struct bContext* C)
{
WM_jobs_kill(CTX_wm_manager(C), filelist);
-}
\ No newline at end of file
+}
Modified: branches/render25/source/blender/editors/space_file/filesel.c
===================================================================
--- branches/render25/source/blender/editors/space_file/filesel.c 2010-03-31 05:44:21 UTC (rev 27888)
+++ branches/render25/source/blender/editors/space_file/filesel.c 2010-03-31 06:49:54 UTC (rev 27889)
@@ -425,7 +425,7 @@
for (i = 0; i < n; i++) {
file = filelist_file(sfile->files, i);
if (fnmatch(pattern, file->relname, 0) == 0) {
- file->flags |= ACTIVE;
+ file->flags |= ACTIVEFILE;
match = 1;
}
}
Modified: branches/render25/source/blender/editors/space_image/image_buttons.c
===================================================================
--- branches/render25/source/blender/editors/space_image/image_buttons.c 2010-03-31 05:44:21 UTC (rev 27888)
+++ branches/render25/source/blender/editors/space_image/image_buttons.c 2010-03-31 06:49:54 UTC (rev 27889)
@@ -113,7 +113,6 @@
static void do_image_panel_events(bContext *C, void *arg, int event)
{
SpaceImage *sima= CTX_wm_space_image(C);
- ARegion *ar= CTX_wm_region(C);
switch(event) {
case B_REDR:
@@ -955,7 +954,6 @@
static void image_panel_uv(const bContext *C, Panel *pa)
{
- ARegion *ar= CTX_wm_region(C);
uiBlock *block;
block= uiLayoutAbsoluteBlock(pa->layout);
@@ -968,14 +966,15 @@
{
PanelType *pt;
- /* editvertex_buts not working atm
- pt= MEM_callocN(sizeof(PanelType), "spacetype image panel uv");
- strcpy(pt->idname, "IMAGE_PT_uv");
- strcpy(pt->label, "UV");
- pt->draw= image_panel_uv;
- pt->poll= image_panel_uv_poll;
- BLI_addtail(&art->paneltypes, pt);
- */
+ /* editvertex_buts not working atm */
+ if(0) {
+ pt= MEM_callocN(sizeof(PanelType), "spacetype image panel uv");
+ strcpy(pt->idname, "IMAGE_PT_uv");
+ strcpy(pt->label, "UV");
+ pt->draw= image_panel_uv;
+ pt->poll= image_panel_uv_poll;
+ BLI_addtail(&art->paneltypes, pt);
+ }
pt= MEM_callocN(sizeof(PanelType), "spacetype image panel curves");
strcpy(pt->idname, "IMAGE_PT_curves");
Modified: branches/render25/source/blender/editors/transform/transform_generics.c
===================================================================
--- branches/render25/source/blender/editors/transform/transform_generics.c 2010-03-31 05:44:21 UTC (rev 27888)
+++ branches/render25/source/blender/editors/transform/transform_generics.c 2010-03-31 06:49:54 UTC (rev 27889)
@@ -1221,9 +1221,8 @@
void calculateCenterCursor2D(TransInfo *t)
{
- View2D *v2d= t->view;
float aspx=1.0, aspy=1.0;
- float *cursor;
+ float *cursor= NULL;
if(t->spacetype==SPACE_IMAGE) {
SpaceImage *sima= (SpaceImage *)t->sa->spacedata.first;
@@ -1232,7 +1231,7 @@
cursor = sima->cursor;
}
- if (v2d) {
+ if (cursor) {
t->center[0] = cursor[0] * aspx;
t->center[1] = cursor[1] * aspy;
}
Modified: branches/render25/source/blender/makesdna/DNA_space_types.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list