Revision: 14842
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14842
Author: blendix
Date: 2008-05-14 18:59:17 +0200 (Wed, 14 May 2008)
Log Message:
-----------
Apricot Branch
==============
svn merge -r 14780:HEAD
Modified Paths:
--------------
branches/apricot/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/apricot/intern/ghost/intern/GHOST_System.cpp
branches/apricot/release/scripts/3ds_export.py
branches/apricot/release/scripts/bevel_center.py
branches/apricot/release/scripts/blenderLipSynchro.py
branches/apricot/release/scripts/export_m3g.py
branches/apricot/release/scripts/hotkeys.py
branches/apricot/release/scripts/import_dxf.py
branches/apricot/release/scripts/paths_import.py
branches/apricot/release/scripts/rvk1_torvk2.py
branches/apricot/release/scripts/uvcalc_lightmap.py
branches/apricot/source/blender/blenkernel/BKE_idprop.h
branches/apricot/source/blender/blenkernel/BKE_mball.h
branches/apricot/source/blender/blenkernel/BKE_writeffmpeg.h
branches/apricot/source/blender/blenkernel/intern/image.c
branches/apricot/source/blender/blenkernel/intern/mball.c
branches/apricot/source/blender/blenkernel/intern/modifier.c
branches/apricot/source/blender/blenkernel/intern/object.c
branches/apricot/source/blender/blenkernel/intern/particle_system.c
branches/apricot/source/blender/blenkernel/intern/scene.c
branches/apricot/source/blender/blenkernel/intern/writeffmpeg.c
branches/apricot/source/blender/blenlib/BLI_edgehash.h
branches/apricot/source/blender/blenlib/intern/boxpack2d.c
branches/apricot/source/blender/blenlib/intern/edgehash.c
branches/apricot/source/blender/blenloader/intern/readfile.c
branches/apricot/source/blender/blenloader/intern/writefile.c
branches/apricot/source/blender/include/BIF_editmesh.h
branches/apricot/source/blender/include/BSE_drawview.h
branches/apricot/source/blender/makesdna/DNA_particle_types.h
branches/apricot/source/blender/makesdna/DNA_scene_types.h
branches/apricot/source/blender/makesdna/DNA_space_types.h
branches/apricot/source/blender/python/api2_2x/Blender.c
branches/apricot/source/blender/python/api2_2x/Object.c
branches/apricot/source/blender/python/api2_2x/Particle.c
branches/apricot/source/blender/python/api2_2x/Particle.h
branches/apricot/source/blender/python/api2_2x/doc/API_intro.py
branches/apricot/source/blender/python/api2_2x/doc/Image.py
branches/apricot/source/blender/python/api2_2x/doc/Object.py
branches/apricot/source/blender/python/api2_2x/doc/Texture.py
branches/apricot/source/blender/render/extern/include/RE_pipeline.h
branches/apricot/source/blender/render/intern/source/convertblender.c
branches/apricot/source/blender/render/intern/source/pipeline.c
branches/apricot/source/blender/render/intern/source/rayshade.c
branches/apricot/source/blender/src/buttons_editing.c
branches/apricot/source/blender/src/buttons_object.c
branches/apricot/source/blender/src/buttons_scene.c
branches/apricot/source/blender/src/buttons_shading.c
branches/apricot/source/blender/src/drawaction.c
branches/apricot/source/blender/src/drawarmature.c
branches/apricot/source/blender/src/drawimage.c
branches/apricot/source/blender/src/drawview.c
branches/apricot/source/blender/src/edit.c
branches/apricot/source/blender/src/editaction.c
branches/apricot/source/blender/src/editarmature.c
branches/apricot/source/blender/src/editface.c
branches/apricot/source/blender/src/editipo.c
branches/apricot/source/blender/src/editmesh_lib.c
branches/apricot/source/blender/src/editmesh_mods.c
branches/apricot/source/blender/src/editmesh_tools.c
branches/apricot/source/blender/src/editsima.c
branches/apricot/source/blender/src/editview.c
branches/apricot/source/blender/src/header_image.c
branches/apricot/source/blender/src/header_ipo.c
branches/apricot/source/blender/src/header_nla.c
branches/apricot/source/blender/src/header_view3d.c
branches/apricot/source/blender/src/interface_icons.c
branches/apricot/source/blender/src/renderwin.c
branches/apricot/source/blender/src/space.c
branches/apricot/source/blender/src/splash.jpg.c
branches/apricot/source/blender/src/transform.c
branches/apricot/source/blender/src/transform_constraints.c
branches/apricot/source/blender/src/transform_conversions.c
branches/apricot/source/blender/src/transform_generics.c
branches/apricot/source/blender/src/transform_manipulator.c
branches/apricot/source/blender/src/transform_orientations.c
branches/apricot/source/blender/src/usiblender.c
branches/apricot/source/blender/src/view.c
branches/apricot/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/apricot/source/gameengine/Ketsji/KX_Light.cpp
branches/apricot/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/apricot/source/gameengine/PyDoc/GameLogic.py
Added Paths:
-----------
branches/apricot/source/blender/python/api2_2x/doc/Particle.py
Modified: branches/apricot/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/apricot/intern/ghost/intern/GHOST_NDOFManager.cpp 2008-05-14
16:49:33 UTC (rev 14841)
+++ branches/apricot/intern/ghost/intern/GHOST_NDOFManager.cpp 2008-05-14
16:59:17 UTC (rev 14842)
@@ -73,7 +73,9 @@
if (ndofLibraryInit && ndofDeviceOpen)
{
Pid= ndofLibraryInit();
+#if 0
printf("%i client \n", Pid);
+#endif
#if defined(_WIN32) || defined(__APPLE__)
m_DeviceHandle = ndofDeviceOpen((void
*)¤tNdofValues);
#else
Modified: branches/apricot/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/apricot/intern/ghost/intern/GHOST_System.cpp 2008-05-14
16:49:33 UTC (rev 14841)
+++ branches/apricot/intern/ghost/intern/GHOST_System.cpp 2008-05-14
16:59:17 UTC (rev 14842)
@@ -283,9 +283,11 @@
m_eventManager = new GHOST_EventManager ();
m_ndofManager = new GHOST_NDOFManager();
+#if 0
if(m_ndofManager)
printf("ndof manager \n");
-
+#endif
+
#ifdef GHOST_DEBUG
if (m_eventManager) {
m_eventManager->addConsumer(&m_eventPrinter);
Modified: branches/apricot/release/scripts/3ds_export.py
===================================================================
--- branches/apricot/release/scripts/3ds_export.py 2008-05-14 16:49:33 UTC
(rev 14841)
+++ branches/apricot/release/scripts/3ds_export.py 2008-05-14 16:59:17 UTC
(rev 14842)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
"""
Name: '3D Studio (.3ds)...'
Blender: 243
Modified: branches/apricot/release/scripts/bevel_center.py
===================================================================
--- branches/apricot/release/scripts/bevel_center.py 2008-05-14 16:49:33 UTC
(rev 14841)
+++ branches/apricot/release/scripts/bevel_center.py 2008-05-14 16:59:17 UTC
(rev 14842)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
""" Registration info for Blender menus
Name: 'Bevel Center'
Blender: 243
Modified: branches/apricot/release/scripts/blenderLipSynchro.py
===================================================================
--- branches/apricot/release/scripts/blenderLipSynchro.py 2008-05-14
16:49:33 UTC (rev 14841)
+++ branches/apricot/release/scripts/blenderLipSynchro.py 2008-05-14
16:59:17 UTC (rev 14842)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
"""
Name: 'BlenderLipSynchro'
Blender: 242
Modified: branches/apricot/release/scripts/export_m3g.py
===================================================================
--- branches/apricot/release/scripts/export_m3g.py 2008-05-14 16:49:33 UTC
(rev 14841)
+++ branches/apricot/release/scripts/export_m3g.py 2008-05-14 16:59:17 UTC
(rev 14842)
@@ -1,4 +1,5 @@
#!BPY
+# coding: utf-8
""" Registration info for Blender menus:
Name: 'M3G (.m3g, .java)...'
Blender: 244
@@ -3069,4 +3070,5 @@
Window.RedrawAll()
if __name__ == '__main__':
- gui()
\ No newline at end of file
+ gui()
+
Modified: branches/apricot/release/scripts/hotkeys.py
===================================================================
--- branches/apricot/release/scripts/hotkeys.py 2008-05-14 16:49:33 UTC (rev
14841)
+++ branches/apricot/release/scripts/hotkeys.py 2008-05-14 16:59:17 UTC (rev
14842)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
""" Registration info for Blender menus:
Name: 'HotKey and MouseAction Reference'
Blender: 242
@@ -918,4 +918,4 @@
Blender.Window.Redraw()
if __name__ == '__main__':
- Register(draw, event, bevent)
\ No newline at end of file
+ Register(draw, event, bevent)
Modified: branches/apricot/release/scripts/import_dxf.py
===================================================================
--- branches/apricot/release/scripts/import_dxf.py 2008-05-14 16:49:33 UTC
(rev 14841)
+++ branches/apricot/release/scripts/import_dxf.py 2008-05-14 16:59:17 UTC
(rev 14842)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
"""
Name: 'Autodesk DXF (.dxf)'
Blender: 244
@@ -5942,4 +5942,5 @@
main(_dxf)
print 'TOTAL TIME: %.6f' % (Blender.sys.time() - TIME)
-"""
\ No newline at end of file
+"""
+
Modified: branches/apricot/release/scripts/paths_import.py
===================================================================
--- branches/apricot/release/scripts/paths_import.py 2008-05-14 16:49:33 UTC
(rev 14841)
+++ branches/apricot/release/scripts/paths_import.py 2008-05-14 16:59:17 UTC
(rev 14842)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
"""
Name: 'Paths (.svg, .ps, .eps, .ai, Gimp)'
Blender: 233
@@ -92,4 +92,5 @@
fonctionSELECT = functionSELECT # can they all be called function?
text = 'Import %s' % argv
-Blender.Window.FileSelector (fonctionSELECT, text)
\ No newline at end of file
+Blender.Window.FileSelector (fonctionSELECT, text)
+
Modified: branches/apricot/release/scripts/rvk1_torvk2.py
===================================================================
--- branches/apricot/release/scripts/rvk1_torvk2.py 2008-05-14 16:49:33 UTC
(rev 14841)
+++ branches/apricot/release/scripts/rvk1_torvk2.py 2008-05-14 16:59:17 UTC
(rev 14842)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
""" Registration info for Blender menus: <- these words are ignored
Name: 'Deformed mesh to Rvk'
Blender: 243
@@ -270,4 +270,4 @@
EDITMODE=Blender.Window.EditMode()
Blender.Window.EditMode(0)
deform2rvk()
-Blender.Window.EditMode(EDITMODE)
\ No newline at end of file
+Blender.Window.EditMode(EDITMODE)
Modified: branches/apricot/release/scripts/uvcalc_lightmap.py
===================================================================
--- branches/apricot/release/scripts/uvcalc_lightmap.py 2008-05-14 16:49:33 UTC
(rev 14841)
+++ branches/apricot/release/scripts/uvcalc_lightmap.py 2008-05-14 16:59:17 UTC
(rev 14842)
@@ -517,7 +517,7 @@
if not Draw.PupBlock('Lightmap Pack', [\
'Context...',
- ('Active Object', PREF_ACT_ONLY, 'If disabled, use all objects for
packing the lightmap.'),\
+ ('Active Object', PREF_ACT_ONLY, 'If disabled, include other selected
objects for packing the lightmap.'),\
('Selected Faces', PREF_SEL_ONLY, 'Use only selected faces from all
selected meshes.'),\
'Image & UVs...',
('Share Tex Space', PREF_PACK_IN_ONE, 'Objects Share texture space, map
all objects into 1 uvmap'),\
@@ -538,7 +538,7 @@
return
meshes = [ ob.getData(mesh=1) ]
else:
- meshes = dict([ (me.name, me) for ob in scn.objects.context for
me in (ob.getData(mesh=1),) if not me.lib])
+ meshes = dict([ (me.name, me) for ob in scn.objects.context for
me in (ob.getData(mesh=1),) if not me.lib if len(me.faces)])
meshes = meshes.values()
if not meshes:
Draw.PupMenu('Error%t|No mesh objects selected.')
Modified: branches/apricot/source/blender/blenkernel/BKE_idprop.h
===================================================================
--- branches/apricot/source/blender/blenkernel/BKE_idprop.h 2008-05-14
16:49:33 UTC (rev 14841)
+++ branches/apricot/source/blender/blenkernel/BKE_idprop.h 2008-05-14
16:59:17 UTC (rev 14842)
@@ -171,4 +171,9 @@
/*Unlinks any struct IDProperty<->ID linkage that might be going on.*/
void IDP_UnlinkProperty(struct IDProperty *prop);
+#define IDP_Int(prop) (prop->data.val)
+#define IDP_Float(prop) (*(float*)&prop->data.val)
+#define IDP_String(prop) ((char*)prop->data.pointer)
+#define IDP_Array(prop) (prop->data.pointer)
+
#endif /* _BKE_IDPROP_H */
Modified: branches/apricot/source/blender/blenkernel/BKE_mball.h
===================================================================
--- branches/apricot/source/blender/blenkernel/BKE_mball.h 2008-05-14
16:49:33 UTC (rev 14841)
+++ branches/apricot/source/blender/blenkernel/BKE_mball.h 2008-05-14
16:59:17 UTC (rev 14842)
@@ -91,7 +91,6 @@
float (*function)(float, float, float);
float size, delta; /* cube size, normal delta */
int bounds; /* cube range within
lattice */
- MB_POINT start; /* start point on surface */
CUBES *cubes; /* active cubes */
VERTICES vertices; /* surface vertices */
CENTERLIST **centers; /* cube center hash table */
Modified: branches/apricot/source/blender/blenkernel/BKE_writeffmpeg.h
===================================================================
--- branches/apricot/source/blender/blenkernel/BKE_writeffmpeg.h
2008-05-14 16:49:33 UTC (rev 14841)
+++ branches/apricot/source/blender/blenkernel/BKE_writeffmpeg.h
2008-05-14 16:59:17 UTC (rev 14842)
@@ -43,6 +43,7 @@
#define FFMPEG_H264 6
#define FFMPEG_XVID 7
#define FFMPEG_FLV 8
+#define FFMPEG_MKV 9
#define FFMPEG_CODEC_MPEG1 0
#define FFMPEG_CODEC_MPEG2 1
@@ -58,6 +59,7 @@
#define FFMPEG_PRESET_SVCD 2
#define FFMPEG_PRESET_VCD 3
#define FFMPEG_PRESET_DV 4
+#define FFMPEG_PRESET_H264 5
struct RenderData;
Modified: branches/apricot/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/apricot/source/blender/blenkernel/intern/image.c 2008-05-14
16:49:33 UTC (rev 14841)
+++ branches/apricot/source/blender/blenkernel/intern/image.c 2008-05-14
16:59:17 UTC (rev 14842)
@@ -1730,31 +1730,38 @@
{
RenderResult *rr= RE_GetResult(RE_GetRender(G.scene->id.name));
- if(rr && iuser) {
+ if(rr) {
RenderResult rres;
float *rectf;
unsigned int *rect;
- int channels= 4, layer= iuser->layer;
+ float dither;
+ int channels, layer, pass;
+
+ channels= 4;
+ layer= (iuser)? iuser->layer: 0;
+ pass= (iuser)? iuser->pass: 0;
/* this gives active layer, composite or seqence result */
RE_GetResultImage(RE_GetRender(G.scene->id.name), &rres);
rect= (unsigned int *)rres.rect32;
rectf= rres.rectf;
-
+ dither= G.scene->r.dither_intensity;
+
/* get compo/seq result by default */
if(rr->rectf && layer==0);
else if(rr->layers.first) {
- RenderLayer *rl= BLI_findlink(&rr->layers,
iuser->layer-(rr->rectf?1:0));
+ RenderLayer *rl= BLI_findlink(&rr->layers,
layer-(rr->rectf?1:0));
if(rl) {
/* there's no combined pass, is in renderlayer
itself */
- if(iuser->pass==0) {
+ if(pass==0) {
rectf= rl->rectf;
}
else {
- RenderPass *rpass=
BLI_findlink(&rl->passes, iuser->pass-1);
+ RenderPass *rpass=
BLI_findlink(&rl->passes, pass-1);
if(rpass) {
channels= rpass->channels;
rectf= rpass->rect;
+ dither= 0.0f; /* don't dither
passes */
}
}
}
@@ -1781,6 +1788,7 @@
ibuf->channels= channels;
ibuf->zbuf_float= rres.rectz;
ibuf->flags |= IB_zbuffloat;
+ ibuf->dither= dither;
ima->ok= IMA_OK_LOADED;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
