Revision: 21505
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21505
Author: nexyon
Date: 2009-07-10 21:55:16 +0200 (Fri, 10 Jul 2009)
Log Message:
-----------
Merged with 2.5 branch revision 21504
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21504
Modified Paths:
--------------
branches/soundsystem/intern/audaspace/intern/AUD_C-API.cpp
branches/soundsystem/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soundsystem/release/ui/buttons_data_lamp.py
branches/soundsystem/release/ui/buttons_particle.py
branches/soundsystem/release/ui/buttons_scene.py
branches/soundsystem/source/Makefile
branches/soundsystem/source/blender/blenkernel/intern/image.c
branches/soundsystem/source/blender/blenlib/BLI_util.h
branches/soundsystem/source/blender/blenlib/intern/util.c
branches/soundsystem/source/blender/blenloader/intern/readfile.c
branches/soundsystem/source/blender/blenloader/intern/writefile.c
branches/soundsystem/source/blender/editors/interface/interface.c
branches/soundsystem/source/blender/editors/interface/interface_handlers.c
branches/soundsystem/source/blender/editors/interface/interface_layout.c
branches/soundsystem/source/blender/editors/interface/interface_regions.c
branches/soundsystem/source/blender/editors/interface/interface_templates.c
branches/soundsystem/source/blender/editors/object/editgroup.c
branches/soundsystem/source/blender/editors/object/object_edit.c
branches/soundsystem/source/blender/editors/object/object_intern.h
branches/soundsystem/source/blender/editors/object/object_ops.c
branches/soundsystem/source/blender/editors/screen/screen_ops.c
branches/soundsystem/source/blender/editors/space_file/file_draw.c
branches/soundsystem/source/blender/editors/space_file/file_intern.h
branches/soundsystem/source/blender/editors/space_file/file_ops.c
branches/soundsystem/source/blender/editors/space_file/filesel.c
branches/soundsystem/source/blender/editors/space_file/space_file.c
branches/soundsystem/source/blender/editors/space_image/image_draw.c
branches/soundsystem/source/blender/editors/space_text/text_draw.c
branches/soundsystem/source/blender/editors/space_view3d/view3d_header.c
branches/soundsystem/source/blender/makesdna/DNA_image_types.h
branches/soundsystem/source/blender/makesdna/DNA_scene_types.h
branches/soundsystem/source/blender/makesrna/RNA_access.h
branches/soundsystem/source/blender/makesrna/intern/makesrna.c
branches/soundsystem/source/blender/makesrna/intern/rna_access.c
branches/soundsystem/source/blender/makesrna/intern/rna_constraint.c
branches/soundsystem/source/blender/makesrna/intern/rna_define.c
branches/soundsystem/source/blender/makesrna/intern/rna_rna.c
branches/soundsystem/source/blender/makesrna/intern/rna_scene.c
branches/soundsystem/source/blender/makesrna/intern/rna_space.c
branches/soundsystem/source/blender/makesrna/intern/rna_ui.c
branches/soundsystem/source/blender/python/generic/Mathutils.h
branches/soundsystem/source/blender/python/intern/bpy_rna.c
branches/soundsystem/source/blender/windowmanager/intern/wm_cursors.c
branches/soundsystem/source/blender/windowmanager/intern/wm_files.c
branches/soundsystem/source/blender/windowmanager/intern/wm_operators.c
branches/soundsystem/source/nan_definitions.mk
Removed Paths:
-------------
branches/soundsystem/source/blender/editors/space_file/file_header.c
Modified: branches/soundsystem/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/soundsystem/intern/audaspace/intern/AUD_C-API.cpp 2009-07-10
19:52:00 UTC (rev 21504)
+++ branches/soundsystem/intern/audaspace/intern/AUD_C-API.cpp 2009-07-10
19:55:16 UTC (rev 21505)
@@ -35,7 +35,7 @@
typedef AUD_IFactory AUD_Sound;
-AUD_IDevice* AUD_device = NULL;
+static AUD_IDevice* AUD_device = NULL;
bool AUD_init()
{
Modified:
branches/soundsystem/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/soundsystem/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-10 19:52:00 UTC (rev 21504)
+++ branches/soundsystem/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-10 19:55:16 UTC (rev 21505)
@@ -747,10 +747,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\editors\space_file\file_header.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\space_file\file_intern.h"
>
</File>
Modified: branches/soundsystem/release/ui/buttons_data_lamp.py
===================================================================
--- branches/soundsystem/release/ui/buttons_data_lamp.py 2009-07-10
19:52:00 UTC (rev 21504)
+++ branches/soundsystem/release/ui/buttons_data_lamp.py 2009-07-10
19:55:16 UTC (rev 21505)
@@ -48,7 +48,7 @@
lamp = context.lamp
- layout.itemR(lamp, "type", expand=True)
+ layout.itemR(lamp, "type")
split = layout.split()
Modified: branches/soundsystem/release/ui/buttons_particle.py
===================================================================
--- branches/soundsystem/release/ui/buttons_particle.py 2009-07-10 19:52:00 UTC
(rev 21504)
+++ branches/soundsystem/release/ui/buttons_particle.py 2009-07-10 19:55:16 UTC
(rev 21505)
@@ -20,7 +20,7 @@
class PARTICLE_PT_particles(ParticleButtonsPanel):
__idname__= "PARTICLE_PT_particles"
- __label__ = " "
+ __no_header__ = True
def poll(self, context):
return (context.particle_system or context.object)
Modified: branches/soundsystem/release/ui/buttons_scene.py
===================================================================
--- branches/soundsystem/release/ui/buttons_scene.py 2009-07-10 19:52:00 UTC
(rev 21504)
+++ branches/soundsystem/release/ui/buttons_scene.py 2009-07-10 19:55:16 UTC
(rev 21505)
@@ -35,6 +35,8 @@
layout = self.layout
rd = context.scene.render_data
+ layout.itemR(rd, "display_mode", text="Display")
+
layout.itemR(rd, "output_path")
split = layout.split()
@@ -54,7 +56,6 @@
col.itemR(rd, "placeholders")
col.itemR(rd, "no_overwrite")
-
layout.itemR(rd, "file_format", text="Format")
split = layout.split()
Modified: branches/soundsystem/source/Makefile
===================================================================
--- branches/soundsystem/source/Makefile 2009-07-10 19:52:00 UTC (rev
21504)
+++ branches/soundsystem/source/Makefile 2009-07-10 19:55:16 UTC (rev
21505)
@@ -114,8 +114,6 @@
COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
- COMLIB += $(OCGDIR)/gameengine/blphys/fuzzics/$(DEBUG_DIR)libfuzzics.a
- COMLIB += $(NAN_QHULL)/lib/libqhull.a
COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
@@ -368,7 +366,7 @@
NAN_SND_LIBS += $(DUMMYSOUND)
NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(SDLSOUND)
- NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
+ NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.so
NAN_SND_LIBS += $(SOUNDSYSTEM)
else
ifeq ($(OS),windows)
Modified: branches/soundsystem/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soundsystem/source/blender/blenkernel/intern/image.c
2009-07-10 19:52:00 UTC (rev 21504)
+++ branches/soundsystem/source/blender/blenkernel/intern/image.c
2009-07-10 19:55:16 UTC (rev 21505)
@@ -253,6 +253,10 @@
if (ima->preview) {
BKE_previewimg_free(&ima->preview);
}
+ if (ima->render_text) {
+ MEM_freeN(ima->render_text);
+ ima->render_text= NULL;
+ }
}
/* only image block itself */
Modified: branches/soundsystem/source/blender/blenlib/BLI_util.h
===================================================================
--- branches/soundsystem/source/blender/blenlib/BLI_util.h 2009-07-10
19:52:00 UTC (rev 21504)
+++ branches/soundsystem/source/blender/blenlib/BLI_util.h 2009-07-10
19:55:16 UTC (rev 21505)
@@ -72,6 +72,9 @@
/* go back one directory */
int BLI_parent_dir(char *path);
+/* return whether directory is root and thus has no parent dir */
+int BLI_has_parent(char *path);
+
/**
* Blender's path code replacement function.
* Bases @a path strings leading with "//" by the
Modified: branches/soundsystem/source/blender/blenlib/intern/util.c
===================================================================
--- branches/soundsystem/source/blender/blenlib/intern/util.c 2009-07-10
19:52:00 UTC (rev 21504)
+++ branches/soundsystem/source/blender/blenlib/intern/util.c 2009-07-10
19:55:16 UTC (rev 21505)
@@ -494,6 +494,22 @@
}
}
+int BLI_has_parent(char *path)
+{
+ int len;
+ int slashes = 0;
+ BLI_clean(path);
+ BLI_add_slash(path);
+
+ len = strlen(path)-1;
+ while (len) {
+ if ((path[len] == '\\') || (path[len] == '/'))
+ slashes++;
+ len--;
+ }
+ return slashes > 1;
+}
+
int BLI_parent_dir(char *path)
{
#ifdef WIN32
Modified: branches/soundsystem/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soundsystem/source/blender/blenloader/intern/readfile.c
2009-07-10 19:52:00 UTC (rev 21504)
+++ branches/soundsystem/source/blender/blenloader/intern/readfile.c
2009-07-10 19:55:16 UTC (rev 21505)
@@ -2641,6 +2641,7 @@
ima->anim= NULL;
ima->rr= NULL;
ima->repbind= NULL;
+ ima->render_text= newdataadr(fd, ima->render_text);
ima->packedfile = direct_link_packedfile(fd, ima->packedfile);
ima->preview = direct_link_preview_image(fd, ima->preview);
Modified: branches/soundsystem/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soundsystem/source/blender/blenloader/intern/writefile.c
2009-07-10 19:52:00 UTC (rev 21504)
+++ branches/soundsystem/source/blender/blenloader/intern/writefile.c
2009-07-10 19:55:16 UTC (rev 21505)
@@ -1439,7 +1439,10 @@
write_previews(wd, ima->preview);
- }
+ /* exception: render text only saved in undo files
(wd->current) */
+ if (ima->render_text && wd->current)
+ writedata(wd, DATA, IMA_RW_MAXTEXT,
ima->render_text);
+ }
ima= ima->id.next;
}
/* flush helps the compression for undo-save */
Modified: branches/soundsystem/source/blender/editors/interface/interface.c
===================================================================
--- branches/soundsystem/source/blender/editors/interface/interface.c
2009-07-10 19:52:00 UTC (rev 21504)
+++ branches/soundsystem/source/blender/editors/interface/interface.c
2009-07-10 19:55:16 UTC (rev 21505)
@@ -2123,7 +2123,9 @@
dynstr= BLI_dynstr_new();
BLI_dynstr_appendf(dynstr, "%s%%t",
RNA_property_ui_name(prop));
for(i=0; i<totitem; i++) {
- if(item[i].icon)
+ if(!item[i].identifier[0])
+ BLI_dynstr_append(dynstr,
"|%l");
+ else if(item[i].icon)
BLI_dynstr_appendf(dynstr, "|%s
%%i%d %%x%d", item[i].name, item[i].icon, item[i].value);
else
BLI_dynstr_appendf(dynstr, "|%s
%%x%d", item[i].name, item[i].value);
@@ -2142,7 +2144,7 @@
RNA_property_enum_items(ptr, prop, &item,
&totitem);
for(i=0; i<totitem; i++) {
- if(item[i].value == (int)max) {
+ if(item[i].identifier[0] &&
item[i].value == (int)max) {
str= (char*)item[i].name;
icon= item[i].icon;
}
@@ -2165,7 +2167,7 @@
RNA_property_enum_items(ptr, prop, &item,
&totitem);
for(i=0; i<totitem; i++) {
- if(item[i].value == (int)max) {
+ if(item[i].identifier[0] &&
item[i].value == (int)max) {
if(item[i].description[0])
tip=
(char*)item[i].description;
break;
Modified:
branches/soundsystem/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soundsystem/source/blender/editors/interface/interface_handlers.c
2009-07-10 19:52:00 UTC (rev 21504)
+++ branches/soundsystem/source/blender/editors/interface/interface_handlers.c
2009-07-10 19:55:16 UTC (rev 21505)
@@ -3434,7 +3434,7 @@
data= MEM_callocN(sizeof(uiHandleButtonData), "uiHandleButtonData");
data->window= CTX_wm_window(C);
data->region= ar;
- if( ELEM(but->type, BUT_CURVE, SEARCH_MENU) ); // XXX curve is temp
+ if( ELEM3(but->type, BUT_CURVE, SEARCH_MENU, TEX) ); // XXX curve is
temp
else data->interactive= 1;
data->state = BUTTON_STATE_INIT;
Modified:
branches/soundsystem/source/blender/editors/interface/interface_layout.c
===================================================================
--- branches/soundsystem/source/blender/editors/interface/interface_layout.c
2009-07-10 19:52:00 UTC (rev 21504)
+++ branches/soundsystem/source/blender/editors/interface/interface_layout.c
2009-07-10 19:55:16 UTC (rev 21505)
@@ -439,6 +439,9 @@
uiBlockSetCurLayout(block, ui_item_local_sublayout(layout, layout, 1));
for(a=0; a<totitem; a++) {
+ if(!item[a].identifier[0])
+ continue;
+
name= (!uiname || uiname[0])? (char*)item[a].name: "";
icon= item[a].icon;
value= item[a].value;
@@ -556,14 +559,12 @@
if(prop) {
const EnumPropertyItem *item;
- int totitem, i;
+ int totitem;
+ const char *name;
RNA_property_enum_items(&ptr, prop, &item, &totitem);
-
- for (i=0; i<totitem; i++) {
- if(item[i].value==retval)
- return (char*)item[i].name;
- }
+ if(RNA_enum_name(item, retval, &name))
+ return (char*)name;
}
return "";
@@ -603,7 +604,10 @@
RNA_property_enum_items(&ptr, prop, &item, &totitem);
for(i=0; i<totitem; i++)
- uiItemEnumO(layout, (char*)item[i].name, item[i].icon,
opname, propname, item[i].value);
@@ 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
