Revision: 23301
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23301
Author: ben2610
Date: 2009-09-17 13:59:32 +0200 (Thu, 17 Sep 2009)
Log Message:
-----------
svn merge -r 23249:23300
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/itasc/CMakeLists.txt
branches/itasc/intern/ghost/GHOST_Types.h
branches/itasc/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp
branches/itasc/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/itasc/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/itasc/intern/ghost/intern/GHOST_WindowX11.cpp
branches/itasc/po/Makefile
branches/itasc/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/itasc/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/itasc/release/io/engine_render_pov.py
branches/itasc/release/io/netrender/client.py
branches/itasc/release/io/netrender/master.py
branches/itasc/release/io/netrender/operators.py
branches/itasc/release/io/netrender/slave.py
branches/itasc/release/io/netrender/ui.py
branches/itasc/release/io/netrender/utils.py
branches/itasc/release/ui/bpy_ops.py
branches/itasc/release/ui/buttons_data_lamp.py
branches/itasc/release/ui/buttons_data_mesh.py
branches/itasc/release/ui/buttons_material.py
branches/itasc/release/ui/buttons_scene.py
branches/itasc/release/ui/buttons_texture.py
branches/itasc/release/ui/space_image.py
branches/itasc/release/ui/space_info.py
branches/itasc/release/ui/space_userpref.py
branches/itasc/release/ui/space_view3d_toolbar.py
branches/itasc/source/blender/blenkernel/BKE_action.h
branches/itasc/source/blender/blenkernel/BKE_node.h
branches/itasc/source/blender/blenkernel/BKE_text.h
branches/itasc/source/blender/blenkernel/intern/action.c
branches/itasc/source/blender/blenkernel/intern/anim_sys.c
branches/itasc/source/blender/blenkernel/intern/image.c
branches/itasc/source/blender/blenkernel/intern/paint.c
branches/itasc/source/blender/blenkernel/intern/pointcache.c
branches/itasc/source/blender/blenkernel/intern/smoke.c
branches/itasc/source/blender/blenkernel/intern/text.c
branches/itasc/source/blender/blenlib/BLI_listbase.h
branches/itasc/source/blender/blenlib/intern/arithb.c
branches/itasc/source/blender/blenlib/intern/listbase.c
branches/itasc/source/blender/blenloader/intern/readblenentry.c
branches/itasc/source/blender/editors/include/ED_datafiles.h
branches/itasc/source/blender/editors/include/ED_image.h
branches/itasc/source/blender/editors/include/ED_node.h
branches/itasc/source/blender/editors/include/UI_interface.h
branches/itasc/source/blender/editors/interface/interface.c
branches/itasc/source/blender/editors/interface/interface_handlers.c
branches/itasc/source/blender/editors/interface/interface_intern.h
branches/itasc/source/blender/editors/interface/interface_layout.c
branches/itasc/source/blender/editors/interface/interface_regions.c
branches/itasc/source/blender/editors/interface/interface_templates.c
branches/itasc/source/blender/editors/interface/interface_utils.c
branches/itasc/source/blender/editors/mesh/loopcut.c
branches/itasc/source/blender/editors/mesh/mesh_intern.h
branches/itasc/source/blender/editors/mesh/mesh_ops.c
branches/itasc/source/blender/editors/object/object_intern.h
branches/itasc/source/blender/editors/object/object_ops.c
branches/itasc/source/blender/editors/object/object_select.c
branches/itasc/source/blender/editors/screen/area.c
branches/itasc/source/blender/editors/screen/screen_edit.c
branches/itasc/source/blender/editors/space_action/action_edit.c
branches/itasc/source/blender/editors/space_action/action_header.c
branches/itasc/source/blender/editors/space_action/action_intern.h
branches/itasc/source/blender/editors/space_action/action_ops.c
branches/itasc/source/blender/editors/space_buttons/space_buttons.c
branches/itasc/source/blender/editors/space_file/file_ops.c
branches/itasc/source/blender/editors/space_file/filelist.c
branches/itasc/source/blender/editors/space_file/filesel.c
branches/itasc/source/blender/editors/space_file/space_file.c
branches/itasc/source/blender/editors/space_graph/graph_buttons.c
branches/itasc/source/blender/editors/space_image/image_buttons.c
branches/itasc/source/blender/editors/space_image/image_ops.c
branches/itasc/source/blender/editors/space_logic/logic_window.c
branches/itasc/source/blender/editors/space_node/drawnode.c
branches/itasc/source/blender/editors/space_node/node_draw.c
branches/itasc/source/blender/editors/space_node/node_select.c
branches/itasc/source/blender/editors/space_view3d/view3d_ops.c
branches/itasc/source/blender/editors/space_view3d/view3d_select.c
branches/itasc/source/blender/editors/uvedit/uvedit_ops.c
branches/itasc/source/blender/makesdna/DNA_ID.h
branches/itasc/source/blender/makesdna/DNA_node_types.h
branches/itasc/source/blender/makesdna/DNA_windowmanager_types.h
branches/itasc/source/blender/makesrna/RNA_access.h
branches/itasc/source/blender/makesrna/RNA_types.h
branches/itasc/source/blender/makesrna/intern/makesrna.c
branches/itasc/source/blender/makesrna/intern/rna_access.c
branches/itasc/source/blender/makesrna/intern/rna_brush.c
branches/itasc/source/blender/makesrna/intern/rna_color.c
branches/itasc/source/blender/makesrna/intern/rna_define.c
branches/itasc/source/blender/makesrna/intern/rna_image.c
branches/itasc/source/blender/makesrna/intern/rna_internal.h
branches/itasc/source/blender/makesrna/intern/rna_key.c
branches/itasc/source/blender/makesrna/intern/rna_lamp.c
branches/itasc/source/blender/makesrna/intern/rna_main.c
branches/itasc/source/blender/makesrna/intern/rna_material.c
branches/itasc/source/blender/makesrna/intern/rna_modifier.c
branches/itasc/source/blender/makesrna/intern/rna_nodetree.c
branches/itasc/source/blender/makesrna/intern/rna_object.c
branches/itasc/source/blender/makesrna/intern/rna_object_api.c
branches/itasc/source/blender/makesrna/intern/rna_particle.c
branches/itasc/source/blender/makesrna/intern/rna_pose.c
branches/itasc/source/blender/makesrna/intern/rna_rna.c
branches/itasc/source/blender/makesrna/intern/rna_scene.c
branches/itasc/source/blender/makesrna/intern/rna_screen.c
branches/itasc/source/blender/makesrna/intern/rna_smoke.c
branches/itasc/source/blender/makesrna/intern/rna_space.c
branches/itasc/source/blender/makesrna/intern/rna_text.c
branches/itasc/source/blender/makesrna/intern/rna_texture.c
branches/itasc/source/blender/makesrna/intern/rna_ui_api.c
branches/itasc/source/blender/makesrna/intern/rna_userdef.c
branches/itasc/source/blender/makesrna/intern/rna_wm.c
branches/itasc/source/blender/makesrna/intern/rna_world.c
branches/itasc/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
branches/itasc/source/blender/python/generic/Mathutils.c
branches/itasc/source/blender/python/intern/bpy_operator.c
branches/itasc/source/blender/python/intern/bpy_rna.c
branches/itasc/source/blender/render/intern/source/voxeldata.c
branches/itasc/source/blender/windowmanager/WM_types.h
branches/itasc/source/blender/windowmanager/intern/wm.c
branches/itasc/source/blender/windowmanager/intern/wm_event_system.c
branches/itasc/source/blender/windowmanager/wm_event_types.h
branches/itasc/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/itasc/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/itasc/source/gameengine/Converter/BL_ArmatureObject.h
branches/itasc/source/nan_definitions.mk
Added Paths:
-----------
branches/itasc/release/datafiles/splash.png
branches/itasc/source/blender/editors/datafiles/splash.png.c
branches/itasc/source/blender/makesrna/intern/rna_text_api.c
Removed Paths:
-------------
branches/itasc/release/datafiles/splash.jpg
branches/itasc/source/blender/editors/datafiles/splash.jpg.c
Property Changed:
----------------
branches/itasc/
branches/itasc/release/io/
branches/itasc/release/io/netrender/
branches/itasc/release/ui/
Property changes on: branches/itasc
___________________________________________________________________
Name: svn:ignore
- user-config.py
.*
build
install
mingw-user-config.py
msvc-user-config.py
sgc.bat
smc.bat
ssenv.bat
user-config.py
*.pdb
mingw
msvc
+ *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
msvc
msvc-user-config.py
obj
sgc.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk
Modified: branches/itasc/CMakeLists.txt
===================================================================
--- branches/itasc/CMakeLists.txt 2009-09-17 11:17:49 UTC (rev 23300)
+++ branches/itasc/CMakeLists.txt 2009-09-17 11:59:32 UTC (rev 23301)
@@ -409,7 +409,7 @@
ENDIF(WITH_JACK)
IF(WITH_SNDFILE)
- SET(SNDFILE /usr)
+ SET(SNDFILE ${LIBDIR}/sndfile)
SET(SNDFILE_INC ${SNDFILE}/include)
SET(SNDFILE_LIB sndfile)
SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
Modified: branches/itasc/intern/ghost/GHOST_Types.h
===================================================================
--- branches/itasc/intern/ghost/GHOST_Types.h 2009-09-17 11:17:49 UTC (rev
23300)
+++ branches/itasc/intern/ghost/GHOST_Types.h 2009-09-17 11:59:32 UTC (rev
23301)
@@ -64,8 +64,14 @@
* the pen's angle in 3D space vertically downwards on to the XY plane
* --Matt
*/
+typedef enum {
+ GHOST_kTabletModeNone = 0,
+ GHOST_kTabletModeStylus,
+ GHOST_kTabletModeEraser
+} GHOST_TTabletMode;
+
typedef struct GHOST_TabletData {
- char Active; /* 0=None, 1=Stylus, 2=Eraser */
+ GHOST_TTabletMode Active; /* 0=None, 1=Stylus, 2=Eraser */
float Pressure; /* range 0.0 (not touching) to 1.0 (full pressure) */
float Xtilt; /* range 0.0 (upright) to 1.0 (tilted fully against the
tablet surface) */
float Ytilt; /* as above */
Modified: branches/itasc/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/itasc/intern/ghost/intern/GHOST_SystemCarbon.cpp 2009-09-17
11:17:49 UTC (rev 23300)
+++ branches/itasc/intern/ghost/intern/GHOST_SystemCarbon.cpp 2009-09-17
11:59:32 UTC (rev 23301)
@@ -788,21 +788,21 @@
switch(tabletProximityRecord.pointerType)
{
case 1: /* stylus */
- ct.Active = 1;
+ ct.Active =
GHOST_kTabletModeStylus;
break;
case 2: /* puck, not supported
so far */
- ct.Active = 0;
+ ct.Active =
GHOST_kTabletModeNone;
break;
case 3: /* eraser */
- ct.Active = 2;
+ ct.Active =
GHOST_kTabletModeEraser;
break;
default:
- ct.Active = 0;
+ ct.Active =
GHOST_kTabletModeNone;
break;
}
} else {
// pointer is leaving - return to mouse
- ct.Active = 0;
+ ct.Active = GHOST_kTabletModeNone;
}
}
}
Modified: branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp 2009-09-17
11:17:49 UTC (rev 23300)
+++ branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp 2009-09-17
11:59:32 UTC (rev 23301)
@@ -684,12 +684,12 @@
{
XProximityNotifyEvent* data =
(XProximityNotifyEvent*)xe;
if(data->deviceid ==
window->GetXTablet().StylusID)
- window->GetXTablet().CommonData.Active=
1;
+ window->GetXTablet().CommonData.Active=
GHOST_kTabletModeStylus;
else if(data->deviceid ==
window->GetXTablet().EraserID)
- window->GetXTablet().CommonData.Active=
2;
+ window->GetXTablet().CommonData.Active=
GHOST_kTabletModeEraser;
}
else if(xe->type == window->GetXTablet().ProxOutEvent)
- window->GetXTablet().CommonData.Active= 0;
+ window->GetXTablet().CommonData.Active=
GHOST_kTabletModeNone;
break;
}
Modified: branches/itasc/intern/ghost/intern/GHOST_WindowCarbon.cpp
===================================================================
--- branches/itasc/intern/ghost/intern/GHOST_WindowCarbon.cpp 2009-09-17
11:17:49 UTC (rev 23300)
+++ branches/itasc/intern/ghost/intern/GHOST_WindowCarbon.cpp 2009-09-17
11:59:32 UTC (rev 23301)
@@ -183,7 +183,7 @@
updateDrawingContext();
activateDrawingContext();
- m_tablet.Active = 0;
+ m_tablet.Active = GHOST_kTabletModeNone;
}
}
Modified: branches/itasc/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/itasc/intern/ghost/intern/GHOST_WindowWin32.cpp 2009-09-17
11:17:49 UTC (rev 23300)
+++ branches/itasc/intern/ghost/intern/GHOST_WindowWin32.cpp 2009-09-17
11:59:32 UTC (rev 23301)
@@ -244,7 +244,7 @@
m_tablet = fpWTOpen( m_hWnd, &lc, TRUE );
if (m_tablet) {
m_tabletData = new GHOST_TabletData();
- m_tabletData->Active = 0;
+ m_tabletData->Active =
GHOST_kTabletModeNone;
}
}
}
@@ -704,7 +704,7 @@
}
}
- m_tabletData->Active = 0;
+ m_tabletData->Active = GHOST_kTabletModeNone;
}
}
}
@@ -720,15 +720,15 @@
switch (pkt.pkCursor) {
case 0: /* first device */
case 3: /* second device */
- m_tabletData->Active =
0; /* puck - not yet supported */
+ m_tabletData->Active =
GHOST_kTabletModeNone; /* puck - not yet supported */
break;
case 1:
case 4:
- m_tabletData->Active =
1; /* stylus */
+ m_tabletData->Active =
GHOST_kTabletModeStylus; /* stylus */
break;
case 2:
case 5:
- m_tabletData->Active =
2; /* eraser */
+ m_tabletData->Active =
GHOST_kTabletModeEraser; /* eraser */
break;
}
if (m_maxPressure > 0) {
Modified: branches/itasc/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/itasc/intern/ghost/intern/GHOST_WindowX11.cpp 2009-09-17
11:17:49 UTC (rev 23300)
+++ branches/itasc/intern/ghost/intern/GHOST_WindowX11.cpp 2009-09-17
11:59:32 UTC (rev 23301)
@@ -425,7 +425,7 @@
XDeviceInfo* device_info = XListInputDevices(m_display,
&device_count);
m_xtablet.StylusDevice = 0;
m_xtablet.EraserDevice = 0;
- m_xtablet.CommonData.Active= 0;
+ m_xtablet.CommonData.Active= GHOST_kTabletModeNone;
/* Install our error handler to override Xlib's
termination behavior */
old_handler = XSetErrorHandler(ApplicationErrorHandler)
;
Modified: branches/itasc/po/Makefile
===================================================================
--- branches/itasc/po/Makefile 2009-09-17 11:17:49 UTC (rev 23300)
+++ branches/itasc/po/Makefile 2009-09-17 11:59:32 UTC (rev 23301)
@@ -50,9 +50,11 @@
$(DIR)%/LC_MESSAGES/blender.mo: %.po
mkdir -p $(@D)
msgfmt -o $@ $<
+ifeq ($(BF_VERIFY_MO_FILES), true)
@cmp $@ $(NANBLENDERHOME)/bin/.blender/locale/$(basename
$<)/LC_MESSAGES/blender.mo \
|| ( echo Mismatch between generated and commited $(basename $<).mo
catalog && \
rm -f $@ && false )
+endif
all debug:: $(LINGUAS_DEST)
# Just trigger the deps
Modified: branches/itasc/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/itasc/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-09-17 11:17:49 UTC (rev 23300)
+++ branches/itasc/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-09-17 11:59:32 UTC (rev 23301)
@@ -380,7 +380,7 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\editors\datafiles\splash.jpg.c"
+
RelativePath="..\..\..\source\blender\editors\datafiles\splash.png.c"
>
</File>
</Filter>
Modified: branches/itasc/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
--- branches/itasc/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2009-09-17 11:17:49 UTC (rev 23300)
+++ branches/itasc/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2009-09-17 11:59:32 UTC (rev 23301)
@@ -806,6 +806,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\makesrna\intern\rna_text_api.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_texture.c"
>
</File>
Deleted: branches/itasc/release/datafiles/splash.jpg
===================================================================
(Binary files differ)
Copied: branches/itasc/release/datafiles/splash.png (from rev 23300,
trunk/blender/release/datafiles/splash.png)
===================================================================
(Binary files differ)
Property changes on: branches/itasc/release/io
___________________________________________________________________
Name: svn:ignore
+ *.pyc
Modified: branches/itasc/release/io/engine_render_pov.py
===================================================================
--- branches/itasc/release/io/engine_render_pov.py 2009-09-17 11:17:49 UTC
(rev 23300)
+++ branches/itasc/release/io/engine_render_pov.py 2009-09-17 11:59:32 UTC
(rev 23301)
@@ -275,7 +275,7 @@
for ob in sel:
ob_num+= 1
- if ob.type in ('LAMP', 'CAMERA', 'EMPTY'):
+ if ob.type in ('LAMP', 'CAMERA', 'EMPTY', 'META'):
continue
me = ob.data
Property changes on: branches/itasc/release/io/netrender
___________________________________________________________________
Name: svn:ignore
+ *.pyc
Modified: branches/itasc/release/io/netrender/client.py
===================================================================
--- branches/itasc/release/io/netrender/client.py 2009-09-17 11:17:49 UTC
(rev 23300)
+++ branches/itasc/release/io/netrender/client.py 2009-09-17 11:59:32 UTC
(rev 23301)
@@ -138,13 +138,13 @@
print("UNKNOWN OPERATION MODE")
def render_master(self, scene):
- server_address = (scene.network_render.server_address,
scene.network_render.server_port)
- httpd = master.RenderMasterServer(server_address,
master.RenderHandler, scene.network_render.path)
- httpd.timeout = 1
- httpd.stats = self.update_stats
- while not self.test_break():
- httpd.handle_request()
+ netsettings = scene.network_render
+
+ address = "" if netsettings.server_address == "[default]" else
netsettings.server_address
+
+ master.runMaster((address, netsettings.server_port),
netsettings.server_broadcast, netsettings.path, self.update_stats,
self.test_break)
+
def render_slave(self, scene):
slave.render_slave(self, scene)
@@ -152,6 +152,7 @@
netsettings = scene.network_render
self.update_stats("", "Network render client initiation")
+
conn = clientConnection(scene)
if conn:
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
