Revision: 29904
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29904
Author: blendix
Date: 2010-07-03 19:23:47 +0200 (Sat, 03 Jul 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29850:29903
Modified Paths:
--------------
branches/render25/CMakeLists.txt
branches/render25/config/darwin-config.py
branches/render25/source/blender/blenkernel/intern/anim.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenlib/intern/path_util.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/armature/editarmature_sketch.c
branches/render25/source/blender/editors/curve/editfont.c
branches/render25/source/blender/editors/metaball/mball_edit.c
branches/render25/source/blender/editors/object/object_modifier.c
branches/render25/source/blender/editors/render/render_shading.c
branches/render25/source/blender/editors/screen/screendump.c
branches/render25/source/blender/editors/sound/sound_ops.c
branches/render25/source/blender/editors/space_buttons/buttons_ops.c
branches/render25/source/blender/editors/space_file/filesel.c
branches/render25/source/blender/editors/space_graph/graph_edit.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_info/info_ops.c
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/editors/space_sequencer/sequencer_add.c
branches/render25/source/blender/editors/space_text/text_ops.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/python/intern/bpy_interface.c
branches/render25/source/blender/windowmanager/WM_api.h
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
Modified: branches/render25/CMakeLists.txt
===================================================================
--- branches/render25/CMakeLists.txt 2010-07-03 17:19:44 UTC (rev 29903)
+++ branches/render25/CMakeLists.txt 2010-07-03 17:23:47 UTC (rev 29904)
@@ -228,6 +228,10 @@
/opt/include/OpenEXR
)
SET(OPENEXR_LIB Half IlmImf Iex Imath)
+
+ IF(NOT OPENEXR_INC)
+ SET(WITH_OPENEXR OFF)
+ ENDIF(NOT OPENEXR_INC)
ENDIF(WITH_OPENEXR)
IF(WITH_TIFF)
@@ -711,7 +715,12 @@
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
ENDIF(WITH_OPENEXR)
- # TODO: IF(WITH_LCMS)
+ IF(WITH_LCMS)
+ SET(LCMS ${LIBDIR}/lcms)
+ SET(LCMS_INCLUDE_DIR ${LCMS}/include)
+ SET(LCMS_LIBRARY lcms)
+ SET(LCMS_LIBPATH ${LCMS}/lib)
+ ENDIF(WITH_LCMS)
IF(WITH_FFMPEG)
SET(FFMPEG ${LIBDIR}/ffmpeg)
Modified: branches/render25/config/darwin-config.py
===================================================================
--- branches/render25/config/darwin-config.py 2010-07-03 17:19:44 UTC (rev
29903)
+++ branches/render25/config/darwin-config.py 2010-07-03 17:23:47 UTC (rev
29904)
@@ -151,6 +151,13 @@
WITH_BF_DDS = True
+#Color Management System
+WITH_BF_LCMS = False
+BF_LCMS = LIBDIR + '/lcms'
+BF_LCMS_INC = '${BF_LCMS}/include'
+BF_LCMS_LIB = 'lcms'
+BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
+
WITH_BF_JPEG = True
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/render25/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/anim.c 2010-07-03
17:19:44 UTC (rev 29903)
+++ branches/render25/source/blender/blenkernel/intern/anim.c 2010-07-03
17:23:47 UTC (rev 29904)
@@ -1534,7 +1534,10 @@
{
DupliObject *dob;
- for(dob= lb->first; dob; dob= dob->next) {
+ /* loop in reverse order, if object is instanced multiple times
+ the original layer may not really be original otherwise, proper
+ solution is more complicated */
+ for(dob= lb->last; dob; dob= dob->prev) {
dob->ob->lay= dob->origlay;
copy_m4_m4(dob->ob->obmat, dob->omat);
}
Modified: branches/render25/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/sequencer.c
2010-07-03 17:19:44 UTC (rev 29903)
+++ branches/render25/source/blender/blenkernel/intern/sequencer.c
2010-07-03 17:23:47 UTC (rev 29904)
@@ -3909,7 +3909,7 @@
void seq_load_apply(Scene *scene, Sequence *seq, SeqLoadInfo *seq_load)
{
if(seq) {
- strcpy(seq->name, seq_load->name);
+ BLI_strncpy(seq->name+2, seq_load->name, sizeof(seq->name)-2);
seqbase_unique_name_recursive(&scene->ed->seqbase, seq);
if(seq_load->flag & SEQ_LOAD_FRAME_ADVANCE) {
@@ -3963,8 +3963,6 @@
seq = alloc_sequence(seqbasep, seq_load->start_frame,
seq_load->channel);
seq->type= SEQ_IMAGE;
- BLI_strncpy(seq->name+2, "Image", SEQ_NAME_MAXSTR-2);
- seqbase_unique_name_recursive(&scene->ed->seqbase, seq);
/* basic defaults */
seq->strip= strip= MEM_callocN(sizeof(Strip), "strip");
@@ -3972,8 +3970,8 @@
strip->len = seq->len = seq_load->len ? seq_load->len : 1;
strip->us= 1;
strip->stripdata= se= MEM_callocN(seq->len*sizeof(StripElem),
"stripelem");
- BLI_split_dirfile(seq_load->path, strip->dir, se->name);
-
+ BLI_strncpy(strip->dir, seq_load->path, sizeof(strip->dir));
+
seq_load_apply(scene, seq, seq_load);
return seq;
@@ -4085,6 +4083,9 @@
seq_load->channel--;
}
+ if(seq_load->name[0] == '\0')
+ BLI_strncpy(seq_load->name, se->name, sizeof(seq_load->name));
+
/* can be NULL */
seq_load_apply(scene, seq, seq_load);
Modified: branches/render25/source/blender/blenlib/intern/path_util.c
===================================================================
--- branches/render25/source/blender/blenlib/intern/path_util.c 2010-07-03
17:19:44 UTC (rev 29903)
+++ branches/render25/source/blender/blenlib/intern/path_util.c 2010-07-03
17:23:47 UTC (rev 29904)
@@ -107,20 +107,14 @@
if (found) break;
}
}
- if (found){
+ if (found) {
if (tail) strcpy(tail, &string[nume+1]);
- if (head) {
- strcpy(head,string);
- head[nums]=0;
- }
+ if (head) BLI_strncpy(head, string, nums);
if (numlen) *numlen = nume-nums+1;
return ((int)atoi(&(string[nums])));
}
if (tail) strcpy(tail, string + len);
- if (head) {
- strncpy(head, string, len);
- head[len] = '\0';
- }
+ if (head) BLI_strncpy(head, string, nums);
if (numlen) *numlen=0;
return 0;
}
Modified: branches/render25/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.c
2010-07-03 17:19:44 UTC (rev 29903)
+++ branches/render25/source/blender/blenloader/intern/readfile.c
2010-07-03 17:23:47 UTC (rev 29904)
@@ -11005,11 +11005,27 @@
for (sl= sa->spacedata.first; sl; sl= sl->next)
{
if (sl->spacetype == SPACE_NODE) {
SpaceNode *snode= (SpaceNode
*)sl;
-
+ ListBase *regionbase;
+ ARegion *ar;
+
+ if (sl == sa->spacedata.first)
+ regionbase =
&sa->regionbase;
+ else
+ regionbase =
&sl->regionbase;
+
if (snode->v2d.minzoom > 0.09f)
snode->v2d.minzoom=
0.09f;
if (snode->v2d.maxzoom < 2.31f)
snode->v2d.maxzoom=
2.31f;
+
+ for (ar= regionbase->first; ar;
ar= ar->next) {
+ if (ar->regiontype ==
RGN_TYPE_WINDOW) {
+ if
(ar->v2d.minzoom > 0.09f)
+
ar->v2d.minzoom= 0.09f;
+ if
(ar->v2d.maxzoom < 2.31f)
+
ar->v2d.maxzoom= 2.31f;
+ }
+ }
}
else if (sl->spacetype == SPACE_TIME) {
SpaceTime *stime= (SpaceTime
*)sl;
Modified:
branches/render25/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- branches/render25/source/blender/editors/armature/editarmature_sketch.c
2010-07-03 17:19:44 UTC (rev 29903)
+++ branches/render25/source/blender/editors/armature/editarmature_sketch.c
2010-07-03 17:23:47 UTC (rev 29904)
@@ -2679,6 +2679,7 @@
RNA_boolean_set(op->ptr, "snap", snap);
break;
case MOUSEMOVE:
+ case INBETWEEN_MOUSEMOVE:
dd->mval[0] = event->mval[0];
dd->mval[1] = event->mval[1];
sk_draw_stroke(C, sketch, stk, dd, snap);
Modified: branches/render25/source/blender/editors/curve/editfont.c
===================================================================
--- branches/render25/source/blender/editors/curve/editfont.c 2010-07-03
17:19:44 UTC (rev 29903)
+++ branches/render25/source/blender/editors/curve/editfont.c 2010-07-03
17:23:47 UTC (rev 29904)
@@ -417,7 +417,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE, FILE_SPECIAL,
FILE_OPENFILE, 0);
+ WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE, FILE_SPECIAL,
FILE_OPENFILE, WM_FILESEL_FILEPATH);
}
/******************* paste buffer operator ********************/
@@ -1732,7 +1732,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- WM_operator_properties_filesel(ot, FOLDERFILE|FTFONTFILE, FILE_SPECIAL,
FILE_OPENFILE, 0);
+ WM_operator_properties_filesel(ot, FOLDERFILE|FTFONTFILE, FILE_SPECIAL,
FILE_OPENFILE, WM_FILESEL_FILEPATH);
}
/******************* delete operator *********************/
Modified: branches/render25/source/blender/editors/metaball/mball_edit.c
===================================================================
--- branches/render25/source/blender/editors/metaball/mball_edit.c
2010-07-03 17:19:44 UTC (rev 29903)
+++ branches/render25/source/blender/editors/metaball/mball_edit.c
2010-07-03 17:23:47 UTC (rev 29904)
@@ -123,23 +123,17 @@
case MB_BALL:
ml->type = MB_BALL;
ml->expx= ml->expy= ml->expz= 1.0;
-
- rename_id((ID *)obedit, "Meta Ball");
- rename_id((ID *)obedit->data, "Meta Ball");
+
break;
case MB_TUBE:
ml->type = MB_TUBE;
ml->expx= ml->expy= ml->expz= 1.0;
-
- rename_id((ID *)obedit, "Meta Tube");
- rename_id((ID *)obedit->data, "Meta Tube");
+
break;
case MB_PLANE:
ml->type = MB_PLANE;
ml->expx= ml->expy= ml->expz= 1.0;
-
- rename_id((ID *)obedit, "Meta Plane");
- rename_id((ID *)obedit->data, "Meta Plane");
+
break;
case MB_ELIPSOID:
ml->type = MB_ELIPSOID;
@@ -147,15 +141,11 @@
ml->expy= 0.8f;
ml->expz= 1.0;
- rename_id((ID *)obedit, "Meta Ellipsoid");
- rename_id((ID *)obedit->data, "Meta Ellipsoid");
break;
case MB_CUBE:
ml->type = MB_CUBE;
ml->expx= ml->expy= ml->expz= 1.0;
-
- rename_id((ID *)obedit, "Meta Cube");
- rename_id((ID *)obedit->data, "Meta Cube");
+
break;
default:
break;
Modified: branches/render25/source/blender/editors/object/object_modifier.c
===================================================================
--- branches/render25/source/blender/editors/object/object_modifier.c
2010-07-03 17:19:44 UTC (rev 29903)
+++ branches/render25/source/blender/editors/object/object_modifier.c
2010-07-03 17:23:47 UTC (rev 29904)
@@ -1081,7 +1081,7 @@
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
- WM_operator_properties_filesel(ot, FOLDERFILE|BTXFILE, FILE_SPECIAL,
FILE_SAVE, FILE_RELPATH);
+ WM_operator_properties_filesel(ot, FOLDERFILE|BTXFILE, FILE_SPECIAL,
FILE_SAVE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH);
edit_modifier_properties(ot);
}
Modified: branches/render25/source/blender/editors/render/render_shading.c
===================================================================
--- branches/render25/source/blender/editors/render/render_shading.c
2010-07-03 17:19:44 UTC (rev 29903)
+++ branches/render25/source/blender/editors/render/render_shading.c
2010-07-03 17:23:47 UTC (rev 29904)
@@ -913,7 +913,7 @@
/* properties */
//RNA_def_enum(ot->srna, "file_type", image_file_type_items, R_PNG,
"File Type", "File type to save image as.");
- WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE,
FILE_SPECIAL, FILE_SAVE, FILE_RELPATH);
+ WM_operator_properties_filesel(ot, FOLDERFILE|IMAGEFILE|MOVIEFILE,
FILE_SPECIAL, FILE_SAVE, WM_FILESEL_FILEPATH|WM_FILESEL_RELPATH);
}
static int envmap_clear_exec(bContext *C, wmOperator *op)
Modified: branches/render25/source/blender/editors/screen/screendump.c
===================================================================
--- branches/render25/source/blender/editors/screen/screendump.c
2010-07-03 17:19:44 UTC (rev 29903)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
