[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42995] branches/bmesh/blender: svn merge ^/trunk/blender -r42973:42991
Campbell Barton
ideasman42 at gmail.com
Fri Dec 30 10:23:14 CET 2011
Revision: 42995
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42995
Author: campbellbarton
Date: 2011-12-30 09:23:06 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42973:42991
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42973
Modified Paths:
--------------
branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
branches/bmesh/blender/intern/cycles/blender/blender_camera.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp
branches/bmesh/blender/intern/smoke/intern/smoke_API.cpp
branches/bmesh/blender/release/plugins/sequence/color-correction-hsv.c
branches/bmesh/blender/release/plugins/sequence/color-correction-yuv.c
branches/bmesh/blender/release/plugins/sequence/dnr.c
branches/bmesh/blender/release/plugins/sequence/gamma.c
branches/bmesh/blender/source/blender/blenkernel/BKE_array_mallocn.h
branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/collada/MeshImporter.cpp
branches/bmesh/blender/source/blender/editors/object/object_bake.c
branches/bmesh/blender/source/blender/editors/physics/physics_fluid.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
branches/bmesh/blender/source/blender/makesdna/DNA_action_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_anim_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_armature_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_boid_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_brush_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_camera_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_cloth_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_color_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_constraint_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_controller_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_curve_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_defs.h
branches/bmesh/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_effect_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_fileglobal_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_genfile.h
branches/bmesh/blender/source/blender/makesdna/DNA_gpencil_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_group_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_image_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_lamp_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_lattice_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_listBase.h
branches/bmesh/blender/source/blender/makesdna/DNA_material_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_meta_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_movieclip_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_nla_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_fluidsim.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_force.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_outliner_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_packedFile_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_particle_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_property_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_screen_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_sdna_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_sensor_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_sequence_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_smoke_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_sound_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_speaker_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_text_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_tracking_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_vec_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_vfont_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_view2d_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_view3d_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_world_types.h
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
branches/bmesh/blender/source/blender/quicktime/apple/qtkit_export.m
branches/bmesh/blender/source/blender/quicktime/apple/qtkit_import.m
branches/bmesh/blender/source/blender/quicktime/apple/quicktime_export.c
branches/bmesh/blender/source/blender/quicktime/apple/quicktime_import.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/bmesh/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/bmesh/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/bmesh/blender/source/gameengine/Converter/KX_IpoConvert.cpp
branches/bmesh/blender/source/gameengine/Expressions/InputParser.cpp
branches/bmesh/blender/source/gameengine/Expressions/Operator1Expr.cpp
branches/bmesh/blender/source/gameengine/Expressions/Operator2Expr.cpp
branches/bmesh/blender/source/gameengine/Expressions/PyObjectPlus.h
branches/bmesh/blender/source/gameengine/Expressions/Value.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/bmesh/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42973
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42991
Modified: branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
===================================================================
--- branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp 2011-12-30 09:23:06 UTC (rev 42995)
@@ -202,7 +202,7 @@
}
- void
+ void
BSP_GhostTestApp3D::
UpdateFrame(
){
@@ -210,9 +210,9 @@
GHOST_Rect v_rect;
m_window->getClientBounds(v_rect);
-
+
glViewport(0,0,v_rect.getWidth(),v_rect.getHeight());
-
+
}
}
Modified: branches/bmesh/blender/intern/cycles/blender/blender_camera.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_camera.cpp 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/intern/cycles/blender/blender_camera.cpp 2011-12-30 09:23:06 UTC (rev 42995)
@@ -72,17 +72,12 @@
if(!b_dof_object)
return b_camera.dof_distance();
- /* for dof object, return distance along camera direction. this is
- * compatible with blender, but does it fit our dof model? */
- Transform obmat = get_transform(b_ob.matrix_world());
+ /* for dof object, return distance along camera Z direction */
+ Transform obmat = transform_clear_scale(get_transform(b_ob.matrix_world()));
Transform dofmat = get_transform(b_dof_object.matrix_world());
+ Transform mat = transform_inverse(obmat) * dofmat;
- float3 cam_p = transform_get_column(&obmat, 3);
- float3 cam_dir = normalize(transform_get_column(&obmat, 2));
- float3 dof_p = transform_get_column(&dofmat, 3);
- float3 proj_p = dot(dof_p, cam_dir) * cam_dir;
-
- return len(proj_p - cam_p);
+ return fabsf(transform_get_column(&mat, 3).z);
}
static void blender_camera_from_object(BlenderCamera *bcam, BL::Object b_ob)
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2011-12-30 09:23:06 UTC (rev 42995)
@@ -579,7 +579,8 @@
static bool g_hasFirstFile = false;
static char g_firstFileBuf[512];
-extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) {
+extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
+{
if (g_hasFirstFile) {
strncpy(buf, g_firstFileBuf, FIRSTFILEBUFLG - 1);
buf[FIRSTFILEBUFLG - 1] = '\0';
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-12-30 09:23:06 UTC (rev 42995)
@@ -451,7 +451,8 @@
static char g_firstFileBuf[512];
//TODO:Need to investigate this. Function called too early in creator.c to have g_hasFirstFile == true
-extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) {
+extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
+{
if (g_hasFirstFile) {
strncpy(buf, g_firstFileBuf, FIRSTFILEBUFLG - 1);
buf[FIRSTFILEBUFLG - 1] = '\0';
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2011-12-30 09:23:06 UTC (rev 42995)
@@ -296,7 +296,8 @@
}
-static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep) {
+static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep)
+{
int fd = ConnectionNumber(display);
fd_set fds;
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp 2011-12-30 09:23:06 UTC (rev 42995)
@@ -70,7 +70,8 @@
{ kEventClassWindow, kEventWindowZoom }, /* for new zoom behaviour */
};
-static OSStatus myWEventHandlerProc(EventHandlerCallRef handler, EventRef event, void* userData) {
+static OSStatus myWEventHandlerProc(EventHandlerCallRef handler, EventRef event, void* userData)
+{
WindowRef mywindow;
GHOST_WindowCarbon *ghost_window;
OSStatus err;
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2011-12-30 09:23:06 UTC (rev 42995)
@@ -1269,7 +1269,8 @@
/* Ron Fosner's code for weighting pixel formats and forcing software.
See http://www.opengl.org/resources/faq/technical/weight.cpp */
-static int WeightPixelFormat(PIXELFORMATDESCRIPTOR& pfd) {
+static int WeightPixelFormat(PIXELFORMATDESCRIPTOR& pfd)
+{
int weight = 0;
/* assume desktop color depth is 32 bits per pixel */
@@ -1302,7 +1303,8 @@
/* A modification of Ron Fosner's replacement for ChoosePixelFormat */
/* returns 0 on error, else returns the pixel format number to be used */
-static int EnumPixelFormats(HDC hdc) {
+static int EnumPixelFormats(HDC hdc)
+{
int iPixelFormat;
int i, n, w, weight = 0;
PIXELFORMATDESCRIPTOR pfd;
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2011-12-30 09:23:06 UTC (rev 42995)
@@ -472,7 +472,8 @@
is configured but not plugged in.
*/
-static int ApplicationErrorHandler(Display *display, XErrorEvent *theEvent) {
+static int ApplicationErrorHandler(Display *display, XErrorEvent *theEvent)
+{
fprintf(stderr, "Ignoring Xlib error: error code %d request code %d\n",
theEvent->error_code, theEvent->request_code) ;
Modified: branches/bmesh/blender/intern/smoke/intern/smoke_API.cpp
===================================================================
--- branches/bmesh/blender/intern/smoke/intern/smoke_API.cpp 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/intern/smoke/intern/smoke_API.cpp 2011-12-30 09:23:06 UTC (rev 42995)
@@ -211,7 +211,8 @@
wt->initBlenderRNA(strength);
}
-template < class T > inline T ABS( T a ) {
+template < class T > inline T ABS( T a )
+{
return (0 < a) ? a : -a ;
}
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-42991
Modified: branches/bmesh/blender/release/plugins/sequence/color-correction-hsv.c
===================================================================
--- branches/bmesh/blender/release/plugins/sequence/color-correction-hsv.c 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/release/plugins/sequence/color-correction-hsv.c 2011-12-30 09:23:06 UTC (rev 42995)
@@ -62,7 +62,8 @@
void plugin_but_changed(int but) {}
void plugin_init() {}
-void plugin_getinfo(PluginInfo *info) {
+void plugin_getinfo(PluginInfo *info)
+{
info->name= name;
info->nvars= sizeof(varstr)/sizeof(VarStruct);
info->cfra= &cfra;
Modified: branches/bmesh/blender/release/plugins/sequence/color-correction-yuv.c
===================================================================
--- branches/bmesh/blender/release/plugins/sequence/color-correction-yuv.c 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/release/plugins/sequence/color-correction-yuv.c 2011-12-30 09:23:06 UTC (rev 42995)
@@ -62,7 +62,8 @@
void plugin_but_changed(int but) {}
void plugin_init() {}
-void plugin_getinfo(PluginInfo *info) {
+void plugin_getinfo(PluginInfo *info)
+{
info->name= name;
info->nvars= sizeof(varstr)/sizeof(VarStruct);
info->cfra= &cfra;
@@ -74,7 +75,8 @@
info->callback= plugin_but_changed;
}
-static void rgb_to_yuv(float rgb[3], float yuv[3]) {
+static void rgb_to_yuv(float rgb[3], float yuv[3])
+{
yuv[0]= 0.299*rgb[0] + 0.587*rgb[1] + 0.114*rgb[2];
yuv[1]= 0.492*(rgb[2] - yuv[0]);
yuv[2]= 0.877*(rgb[0] - yuv[0]);
@@ -84,7 +86,8 @@
yuv[2] /= 0.615;
}
-static void yuv_to_rgb(float yuv[3], float rgb[3]) {
+static void yuv_to_rgb(float yuv[3], float rgb[3])
+{
yuv[1] *= 0.436;
yuv[2] *= 0.615;
Modified: branches/bmesh/blender/release/plugins/sequence/dnr.c
===================================================================
--- branches/bmesh/blender/release/plugins/sequence/dnr.c 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/release/plugins/sequence/dnr.c 2011-12-30 09:23:06 UTC (rev 42995)
@@ -90,7 +90,8 @@
free(d);
}
-void plugin_getinfo(PluginInfo *info) {
+void plugin_getinfo(PluginInfo *info)
+{
info->name= name;
info->nvars= sizeof(varstr)/sizeof(VarStruct);
info->cfra= &cfra;
Modified: branches/bmesh/blender/release/plugins/sequence/gamma.c
===================================================================
--- branches/bmesh/blender/release/plugins/sequence/gamma.c 2011-12-30 08:40:36 UTC (rev 42994)
+++ branches/bmesh/blender/release/plugins/sequence/gamma.c 2011-12-30 09:23:06 UTC (rev 42995)
@@ -67,7 +67,8 @@
void plugin_but_changed(int but) {}
void plugin_init() {}
-void plugin_getinfo(PluginInfo *info) {
+void plugin_getinfo(PluginInfo *info)
+{
info->name= name;
info->nvars= sizeof(varstr)/sizeof(VarStruct);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list