[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60321] branches/soc-2013-dingto: Merged revision(s) 60246-60320 from trunk/blender into soc-2013-dingto.
Thomas Dinges
blender at dingto.org
Mon Sep 23 02:31:15 CEST 2013
Revision: 60321
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60321
Author: dingto
Date: 2013-09-23 00:31:14 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
Merged revision(s) 60246-60320 from trunk/blender into soc-2013-dingto.
Modified Paths:
--------------
branches/soc-2013-dingto/build_files/cmake/macros.cmake
branches/soc-2013-dingto/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-dingto/intern/ghost/SConscript
branches/soc-2013-dingto/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-dingto/intern/locale/boost_locale_wrapper.cpp
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_text.py
branches/soc-2013-dingto/release/text/readme.html
branches/soc-2013-dingto/source/blender/blenkernel/BKE_customdata.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-dingto/source/blender/blenloader/intern/writefile.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-dingto/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-dingto/source/blender/collada/MeshImporter.cpp
branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_ops.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_templates.c
branches/soc-2013-dingto/source/blender/editors/mesh/meshtools.c
branches/soc-2013-dingto/source/blender/editors/object/object_bake.c
branches/soc-2013-dingto/source/blender/editors/space_text/space_text.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2013-dingto/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-dingto/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-dingto/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2013-dingto/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2013-dingto/source/blender/makesrna/RNA_access.h
branches/soc-2013-dingto/source/blender/makesrna/RNA_define.h
branches/soc-2013-dingto/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-dingto/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_action.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_animation.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_boid.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_curve.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_internal.h
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_key.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_linestyle.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_material.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mesh_utils.h
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_nla.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_particle.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_pose.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_rigidbody.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_screen.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_test.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_texture.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_ui.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2013-dingto/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2013-dingto/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2013-dingto/source/blender/render/intern/include/texture.h
branches/soc-2013-dingto/source/blender/render/intern/source/bake.c
branches/soc-2013-dingto/source/blender/render/intern/source/rayshade.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_operators.c
Property Changed:
----------------
branches/soc-2013-dingto/
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604-60245
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604-60320
Modified: branches/soc-2013-dingto/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-dingto/build_files/cmake/macros.cmake 2013-09-23 00:16:40 UTC (rev 60320)
+++ branches/soc-2013-dingto/build_files/cmake/macros.cmake 2013-09-23 00:31:14 UTC (rev 60321)
@@ -774,6 +774,9 @@
COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${file_from} ${file_to}
DEPENDS ${file_from} datatoc)
+
+ set_source_files_properties(${file_to} PROPERTIES GENERATED TRUE)
+
unset(_file_to_path)
endmacro()
@@ -797,10 +800,11 @@
COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${_file_from} ${_file_to}
DEPENDS ${_file_from} datatoc)
+ set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE)
+
unset(_file_from)
unset(_file_to)
unset(_file_to_path)
-
endmacro()
# XXX Not used for now...
Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_curves.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_curves.cpp 2013-09-23 00:16:40 UTC (rev 60320)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_curves.cpp 2013-09-23 00:31:14 UTC (rev 60321)
@@ -217,8 +217,8 @@
float3 pcKey;
for(int step_no = 0; step_no <= ren_step; step_no++) {
float nco[3];
- b_psys.co_hair(*b_ob, psmd, pa_no, step_no, nco);
- float3 cKey = make_float3(nco[0],nco[1],nco[2]);
+ b_psys.co_hair(*b_ob, pa_no, step_no, nco);
+ float3 cKey = make_float3(nco[0], nco[1], nco[2]);
cKey = transform_point(&itfm, cKey);
if(step_no > 0)
curve_length += len(cKey - pcKey);
Modified: branches/soc-2013-dingto/intern/ghost/SConscript
===================================================================
--- branches/soc-2013-dingto/intern/ghost/SConscript 2013-09-23 00:16:40 UTC (rev 60320)
+++ branches/soc-2013-dingto/intern/ghost/SConscript 2013-09-23 00:31:14 UTC (rev 60321)
@@ -157,8 +157,9 @@
elif env['WITH_GHOST_COCOA']: # always use default-Apple-gcc for objC language, for gnu-compilers do not support it fully yet
env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
- env.BlenderLib ('bf_intern_ghostndof3dconnexion', sources2, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC"
+ if env['WITH_BF_3DMOUSE']:
+ env.BlenderLib ('bf_intern_ghostndof3dconnexion', sources2, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
else:
env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] )
Modified: branches/soc-2013-dingto/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
===================================================================
--- branches/soc-2013-dingto/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm 2013-09-23 00:16:40 UTC (rev 60320)
+++ branches/soc-2013-dingto/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm 2013-09-23 00:31:14 UTC (rev 60321)
@@ -74,7 +74,7 @@
else
askedDisplay = [[NSScreen screens] objectAtIndex:display];
- if(askedDisplay == nil) {
+ if (askedDisplay == nil) {
[pool drain];
return GHOST_kFailure;
}
@@ -109,7 +109,7 @@
else
askedDisplay = [[NSScreen screens] objectAtIndex:display];
- if(askedDisplay == nil) {
+ if (askedDisplay == nil) {
[pool drain];
return GHOST_kFailure;
}
Modified: branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemCocoa.mm 2013-09-23 00:16:40 UTC (rev 60320)
+++ branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemCocoa.mm 2013-09-23 00:31:14 UTC (rev 60321)
@@ -1541,8 +1541,8 @@
window->clientToScreenIntern(x_warp+x_accum, y_warp+y_accum, x, y);
pushEvent(new GHOST_EventCursor([event timestamp] * 1000, GHOST_kEventCursorMove, window, x, y));
+ break;
}
- break;
case GHOST_kGrabWrap: //Wrap cursor at area/window boundaries
{
NSPoint mousePos = [cocoawindow mouseLocationOutsideOfEventStream];
@@ -1552,7 +1552,7 @@
GHOST_Rect bounds, windowBounds, correctedBounds;
/* fallback to window bounds */
- if(window->getCursorGrabBounds(bounds)==GHOST_kFailure)
+ if (window->getCursorGrabBounds(bounds) == GHOST_kFailure)
window->getClientBounds(bounds);
//Switch back to Cocoa coordinates orientation (y=0 at botton,the same as blender internal btw!), and to client coordinates
@@ -1586,8 +1586,8 @@
window->getCursorGrabInitPos(x_cur, y_cur);
window->clientToScreenIntern(x_cur + x_accum, y_cur + y_accum, x, y);
pushEvent(new GHOST_EventCursor([event timestamp] * 1000, GHOST_kEventCursorMove, window, x, y));
+ break;
}
- break;
default:
{
//Normal cursor operation: send mouse position in window
@@ -1599,8 +1599,8 @@
m_cursorDelta_x=0;
m_cursorDelta_y=0; //Mouse motion occurred between two cursor warps, so we can reset the delta counter
+ break;
}
- break;
}
}
break;
@@ -1854,7 +1854,7 @@
[pool drain];
- if(temp_buff) {
+ if (temp_buff) {
return temp_buff;
}
else {
@@ -1866,7 +1866,7 @@
{
NSString *textToCopy;
- if(selection) {return;} // for copying the selection, used on X11
+ if (selection) return; // for copying the selection, used on X11
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
Modified: branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemWin32.cpp 2013-09-23 00:16:40 UTC (rev 60320)
+++ branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemWin32.cpp 2013-09-23 00:31:14 UTC (rev 60321)
@@ -599,17 +599,19 @@
case VK_GR_LESS: key = GHOST_kKeyGrLess; break;
case VK_SHIFT:
- /* Check single shift presses */
- if (scanCode == 0x36) {
- key = GHOST_kKeyRightShift;
- } else if (scanCode == 0x2a) {
- key = GHOST_kKeyLeftShift;
- } else {
- /* Must be a combination SHIFT (Left or Right) + a Key
- * Ignore this as the next message will contain
- * the desired "Key" */
- key = GHOST_kKeyUnknown;
- }
+ /* Check single shift presses */
+ if (scanCode == 0x36) {
+ key = GHOST_kKeyRightShift;
+ }
+ else if (scanCode == 0x2a) {
+ key = GHOST_kKeyLeftShift;
+ }
+ else {
+ /* Must be a combination SHIFT (Left or Right) + a Key
+ * Ignore this as the next message will contain
+ * the desired "Key" */
+ key = GHOST_kKeyUnknown;
+ }
break;
case VK_CONTROL:
key = (extend) ? GHOST_kKeyRightControl : GHOST_kKeyLeftControl;
@@ -1162,7 +1164,7 @@
* message without calling DefWindowProc.
*/
/* we get first WM_SIZE before we fully init. So, do not dispatch before we continiously resizng */
- if(window->m_inLiveResize) {
+ if (window->m_inLiveResize) {
system->pushEvent(processWindowEvent(GHOST_kEventWindowSize, window));
system->dispatchEvents();
}
Modified: branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-23 00:16:40 UTC (rev 60320)
+++ branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-23 00:31:14 UTC (rev 60321)
@@ -179,12 +179,12 @@
RECT rect, desktop;
int wintype = WS_OVERLAPPEDWINDOW;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list