[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58421] branches/ge_dev: Merged changes from trunk r58324-58419.
Mitchell Stokes
mogurijin at gmail.com
Sat Jul 20 00:10:11 CEST 2013
Revision: 58421
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58421
Author: moguri
Date: 2013-07-19 22:10:11 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
Merged changes from trunk r58324-58419.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58324
Modified Paths:
--------------
branches/ge_dev/CMakeLists.txt
branches/ge_dev/intern/cycles/blender/blender_sync.cpp
branches/ge_dev/intern/cycles/kernel/kernel_light.h
branches/ge_dev/intern/cycles/render/session.cpp
branches/ge_dev/intern/ghost/intern/GHOST_DropTargetX11.cpp
branches/ge_dev/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/ge_dev/intern/ghost/intern/GHOST_SystemX11.cpp
branches/ge_dev/intern/ghost/intern/GHOST_SystemX11.h
branches/ge_dev/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/ge_dev/intern/opencl/OCL_opencl.h
branches/ge_dev/intern/opencl/intern/OCL_opencl.c
branches/ge_dev/intern/opencl/intern/clew.c
branches/ge_dev/intern/tools/credits_svn_gen.py
branches/ge_dev/release/datafiles/LICENSE-droidsans.ttf.txt
branches/ge_dev/release/datafiles/fonts/droidsans.ttf.gz
branches/ge_dev/release/datafiles/splash.png
branches/ge_dev/release/scripts/startup/bl_operators/node.py
branches/ge_dev/release/scripts/startup/bl_ui/space_view3d.py
branches/ge_dev/source/blender/blenkernel/BKE_DerivedMesh.h
branches/ge_dev/source/blender/blenkernel/BKE_blender.h
branches/ge_dev/source/blender/blenkernel/BKE_fcurve.h
branches/ge_dev/source/blender/blenkernel/BKE_key.h
branches/ge_dev/source/blender/blenkernel/intern/action.c
branches/ge_dev/source/blender/blenkernel/intern/armature.c
branches/ge_dev/source/blender/blenkernel/intern/cdderivedmesh.c
branches/ge_dev/source/blender/blenkernel/intern/colortools.c
branches/ge_dev/source/blender/blenkernel/intern/constraint.c
branches/ge_dev/source/blender/blenkernel/intern/curve.c
branches/ge_dev/source/blender/blenkernel/intern/customdata.c
branches/ge_dev/source/blender/blenkernel/intern/deform.c
branches/ge_dev/source/blender/blenkernel/intern/editderivedmesh.c
branches/ge_dev/source/blender/blenkernel/intern/fcurve.c
branches/ge_dev/source/blender/blenkernel/intern/fmodifier.c
branches/ge_dev/source/blender/blenkernel/intern/implicit.c
branches/ge_dev/source/blender/blenkernel/intern/ipo.c
branches/ge_dev/source/blender/blenkernel/intern/key.c
branches/ge_dev/source/blender/blenkernel/intern/linestyle.c
branches/ge_dev/source/blender/blenkernel/intern/mask_rasterize.c
branches/ge_dev/source/blender/blenkernel/intern/material.c
branches/ge_dev/source/blender/blenkernel/intern/mesh.c
branches/ge_dev/source/blender/blenkernel/intern/node.c
branches/ge_dev/source/blender/blenkernel/intern/object.c
branches/ge_dev/source/blender/blenkernel/intern/sequencer.c
branches/ge_dev/source/blender/blenkernel/intern/subsurf_ccg.c
branches/ge_dev/source/blender/blenkernel/intern/writeffmpeg.c
branches/ge_dev/source/blender/blenlib/intern/BLI_ghash.c
branches/ge_dev/source/blender/blenlib/intern/BLI_mempool.c
branches/ge_dev/source/blender/blenlib/intern/DLRB_tree.c
branches/ge_dev/source/blender/blenlib/intern/math_geom.c
branches/ge_dev/source/blender/blenlib/intern/math_rotation.c
branches/ge_dev/source/blender/blenlib/intern/path_util.c
branches/ge_dev/source/blender/blenlib/intern/storage.c
branches/ge_dev/source/blender/blenloader/intern/readfile.c
branches/ge_dev/source/blender/bmesh/intern/bmesh_operators.c
branches/ge_dev/source/blender/bmesh/operators/bmo_create.c
branches/ge_dev/source/blender/bmesh/operators/bmo_dupe.c
branches/ge_dev/source/blender/bmesh/operators/bmo_extrude.c
branches/ge_dev/source/blender/collada/ArmatureImporter.cpp
branches/ge_dev/source/blender/collada/ControllerExporter.cpp
branches/ge_dev/source/blender/collada/MeshImporter.cpp
branches/ge_dev/source/blender/collada/TransformWriter.cpp
branches/ge_dev/source/blender/collada/collada_utils.cpp
branches/ge_dev/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/ge_dev/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/ge_dev/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/ge_dev/source/blender/editors/animation/anim_channels_defines.c
branches/ge_dev/source/blender/editors/animation/anim_channels_edit.c
branches/ge_dev/source/blender/editors/animation/anim_draw.c
branches/ge_dev/source/blender/editors/animation/anim_filter.c
branches/ge_dev/source/blender/editors/animation/drivers.c
branches/ge_dev/source/blender/editors/animation/fmodifier_ui.c
branches/ge_dev/source/blender/editors/animation/keyframes_draw.c
branches/ge_dev/source/blender/editors/animation/keyframing.c
branches/ge_dev/source/blender/editors/animation/keyingsets.c
branches/ge_dev/source/blender/editors/armature/armature_intern.h
branches/ge_dev/source/blender/editors/armature/armature_ops.c
branches/ge_dev/source/blender/editors/armature/armature_select.c
branches/ge_dev/source/blender/editors/armature/pose_slide.c
branches/ge_dev/source/blender/editors/gpencil/drawgpencil.c
branches/ge_dev/source/blender/editors/gpencil/gpencil_edit.c
branches/ge_dev/source/blender/editors/gpencil/gpencil_paint.c
branches/ge_dev/source/blender/editors/interface/interface.c
branches/ge_dev/source/blender/editors/interface/interface_widgets.c
branches/ge_dev/source/blender/editors/interface/view2d.c
branches/ge_dev/source/blender/editors/interface/view2d_ops.c
branches/ge_dev/source/blender/editors/mesh/editmesh_loopcut.c
branches/ge_dev/source/blender/editors/mesh/editmesh_select.c
branches/ge_dev/source/blender/editors/object/object_intern.h
branches/ge_dev/source/blender/editors/object/object_lattice.c
branches/ge_dev/source/blender/editors/object/object_ops.c
branches/ge_dev/source/blender/editors/object/object_relations.c
branches/ge_dev/source/blender/editors/render/render_opengl.c
branches/ge_dev/source/blender/editors/render/render_shading.c
branches/ge_dev/source/blender/editors/screen/screen_ops.c
branches/ge_dev/source/blender/editors/sculpt_paint/paint_stroke.c
branches/ge_dev/source/blender/editors/space_action/action_draw.c
branches/ge_dev/source/blender/editors/space_action/action_edit.c
branches/ge_dev/source/blender/editors/space_action/action_select.c
branches/ge_dev/source/blender/editors/space_clip/space_clip.c
branches/ge_dev/source/blender/editors/space_graph/graph_buttons.c
branches/ge_dev/source/blender/editors/space_graph/space_graph.c
branches/ge_dev/source/blender/editors/space_nla/nla_buttons.c
branches/ge_dev/source/blender/editors/space_nla/nla_channels.c
branches/ge_dev/source/blender/editors/space_nla/nla_draw.c
branches/ge_dev/source/blender/editors/space_node/drawnode.c
branches/ge_dev/source/blender/editors/space_node/node_draw.c
branches/ge_dev/source/blender/editors/space_node/node_edit.c
branches/ge_dev/source/blender/editors/space_node/node_templates.c
branches/ge_dev/source/blender/editors/space_node/space_node.c
branches/ge_dev/source/blender/editors/space_outliner/outliner_draw.c
branches/ge_dev/source/blender/editors/space_outliner/outliner_edit.c
branches/ge_dev/source/blender/editors/space_outliner/outliner_tools.c
branches/ge_dev/source/blender/editors/space_outliner/outliner_tree.c
branches/ge_dev/source/blender/editors/space_time/space_time.c
branches/ge_dev/source/blender/editors/space_view3d/drawarmature.c
branches/ge_dev/source/blender/editors/space_view3d/drawmesh.c
branches/ge_dev/source/blender/editors/space_view3d/view3d_edit.c
branches/ge_dev/source/blender/editors/space_view3d/view3d_intern.h
branches/ge_dev/source/blender/editors/space_view3d/view3d_ops.c
branches/ge_dev/source/blender/editors/space_view3d/view3d_view.c
branches/ge_dev/source/blender/editors/transform/transform.c
branches/ge_dev/source/blender/editors/transform/transform_constraints.c
branches/ge_dev/source/blender/imbuf/intern/anim_movie.c
branches/ge_dev/source/blender/imbuf/intern/cineon/logImageCore.c
branches/ge_dev/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/ge_dev/source/blender/makesdna/DNA_curve_types.h
branches/ge_dev/source/blender/makesdna/DNA_view3d_types.h
branches/ge_dev/source/blender/makesrna/intern/rna_color.c
branches/ge_dev/source/blender/makesrna/intern/rna_image.c
branches/ge_dev/source/blender/makesrna/intern/rna_object.c
branches/ge_dev/source/blender/makesrna/intern/rna_scene.c
branches/ge_dev/source/blender/makesrna/intern/rna_wm.c
branches/ge_dev/source/blender/makesrna/intern/rna_wm_api.c
branches/ge_dev/source/blender/modifiers/intern/MOD_shapekey.c
branches/ge_dev/source/blender/nodes/NOD_static_types.h
branches/ge_dev/source/blender/nodes/intern/node_socket.c
branches/ge_dev/source/blender/nodes/shader/nodes/node_shader_math.c
branches/ge_dev/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/ge_dev/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/ge_dev/source/blender/windowmanager/intern/wm_event_system.c
branches/ge_dev/source/blender/windowmanager/intern/wm_operators.c
branches/ge_dev/source/blender/windowmanager/wm_event_types.h
branches/ge_dev/source/gameengine/Expressions/KX_HashedPtr.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_GameObject.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/ge_dev/source/tools/check_style_c.py
Property Changed:
----------------
branches/ge_dev/
branches/ge_dev/source/blender/editors/interface/interface.c
branches/ge_dev/source/blender/editors/space_outliner/
Property changes on: branches/ge_dev
___________________________________________________________________
Modified: svn:mergeinfo
- /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:58091-58323
+ /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:58091-58323,58325-58419
Modified: branches/ge_dev/CMakeLists.txt
===================================================================
--- branches/ge_dev/CMakeLists.txt 2013-07-19 22:07:38 UTC (rev 58420)
+++ branches/ge_dev/CMakeLists.txt 2013-07-19 22:10:11 UTC (rev 58421)
@@ -1964,6 +1964,7 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_NULL -Wnonnull) # C only
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_TYPE_LIMITS -Wtype-limits)
# gcc 4.2 gives annoying warnings on every file with this
if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
@@ -1990,6 +1991,7 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_INIT_SELF -Winit-self) # needs -Wuninitialized
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_INCLUDE_DIRS -Wmissing-include-dirs)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_TYPE_LIMITS -Wtype-limits)
# gcc 4.2 gives annoying warnings on every file with this
if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
Modified: branches/ge_dev/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/ge_dev/intern/cycles/blender/blender_sync.cpp 2013-07-19 22:07:38 UTC (rev 58420)
+++ branches/ge_dev/intern/cycles/blender/blender_sync.cpp 2013-07-19 22:10:11 UTC (rev 58421)
@@ -392,7 +392,7 @@
else {
params.samples = get_int(cscene, "preview_aa_samples");
if(params.samples == 0)
- params.samples = INT_MAX;
+ params.samples = 65536;
}
}
else {
@@ -402,7 +402,7 @@
else {
params.samples = get_int(cscene, "preview_samples");
if(params.samples == 0)
- params.samples = INT_MAX;
+ params.samples = 65536;
}
}
Modified: branches/ge_dev/intern/cycles/kernel/kernel_light.h
===================================================================
--- branches/ge_dev/intern/cycles/kernel/kernel_light.h 2013-07-19 22:07:38 UTC (rev 58420)
+++ branches/ge_dev/intern/cycles/kernel/kernel_light.h 2013-07-19 22:10:11 UTC (rev 58421)
@@ -271,7 +271,7 @@
ls->pdf = invarea;
if(type == LIGHT_SPOT) {
- /* spot light attentuation */
+ /* spot light attenuation */
float4 data2 = kernel_tex_fetch(__light_data, lamp*LIGHT_SIZE + 2);
ls->eval_fac *= spot_light_attenuation(data1, data2, ls);
}
Modified: branches/ge_dev/intern/cycles/render/session.cpp
===================================================================
--- branches/ge_dev/intern/cycles/render/session.cpp 2013-07-19 22:07:38 UTC (rev 58420)
+++ branches/ge_dev/intern/cycles/render/session.cpp 2013-07-19 22:10:11 UTC (rev 58421)
@@ -786,7 +786,7 @@
substatus += string_printf(", Sample %d/%d", sample, num_samples);
}
}
- else if(tile_manager.num_samples == INT_MAX)
+ else if(tile_manager.num_samples == 65536)
substatus = string_printf("Path Tracing Sample %d", sample+1);
else
substatus = string_printf("Path Tracing Sample %d/%d", sample+1, tile_manager.num_samples);
Modified: branches/ge_dev/intern/ghost/intern/GHOST_DropTargetX11.cpp
===================================================================
--- branches/ge_dev/intern/ghost/intern/GHOST_DropTargetX11.cpp 2013-07-19 22:07:38 UTC (rev 58420)
+++ branches/ge_dev/intern/ghost/intern/GHOST_DropTargetX11.cpp 2013-07-19 22:10:11 UTC (rev 58421)
@@ -191,7 +191,7 @@
char *GHOST_DropTargetX11::FileUrlDecode(char *fileUrl)
{
- if (!strncpy(fileUrl, "file://", 7) == 0) {
+ if (strncpy(fileUrl, "file://", 7) != 0) {
/* assume one character of encoded URL can be expanded to 4 chars max */
int decodedSize = 4 * strlen(fileUrl) + 1;
char *decodedPath = (char *)malloc(decodedSize);
Modified: branches/ge_dev/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/ge_dev/intern/ghost/intern/GHOST_SystemCarbon.cpp 2013-07-19 22:07:38 UTC (rev 58420)
+++ branches/ge_dev/intern/ghost/intern/GHOST_SystemCarbon.cpp 2013-07-19 22:10:11 UTC (rev 58421)
@@ -858,7 +858,8 @@
break;
case kEventMouseMoved:
- case kEventMouseDragged: {
+ case kEventMouseDragged:
+ {
Point mousePos;
if (window) {
Modified: branches/ge_dev/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/ge_dev/intern/ghost/intern/GHOST_SystemX11.cpp 2013-07-19 22:07:38 UTC (rev 58420)
+++ branches/ge_dev/intern/ghost/intern/GHOST_SystemX11.cpp 2013-07-19 22:10:11 UTC (rev 58421)
@@ -1139,7 +1139,8 @@
break;
}
- default: {
+ default:
+ {
#ifdef WITH_X11_XINPUT
if (xe->type == m_xtablet.MotionEvent) {
XDeviceMotionEvent *data = (XDeviceMotionEvent *)xe;
@@ -1505,7 +1506,7 @@
#define XCLIB_XCOUT_FALLBACK_TEXT 6
/* Retrieves the contents of a selections. */
-void GHOST_SystemX11::getClipboard_xcout(XEvent evt,
+void GHOST_SystemX11::getClipboard_xcout(const XEvent *evt,
Atom sel, Atom target, unsigned char **txt,
unsigned long *len, unsigned int *context) const
{
@@ -1535,18 +1536,18 @@
return;
case XCLIB_XCOUT_SENTCONVSEL:
- if (evt.type != SelectionNotify)
+ if (evt->type != SelectionNotify)
return;
- if (target == m_atom.UTF8_STRING && evt.xselection.property == None) {
+ if (target == m_atom.UTF8_STRING && evt->xselection.property == None) {
*context = XCLIB_XCOUT_FALLBACK_UTF8;
return;
}
- else if (target == m_atom.COMPOUND_TEXT && evt.xselection.property == None) {
+ else if (target == m_atom.COMPOUND_TEXT && evt->xselection.property == None) {
*context = XCLIB_XCOUT_FALLBACK_COMP;
return;
}
- else if (target == m_atom.TEXT && evt.xselection.property == None) {
+ else if (target == m_atom.TEXT && evt->xselection.property == None) {
*context = XCLIB_XCOUT_FALLBACK_TEXT;
return;
}
@@ -1604,11 +1605,11 @@
* then read it, delete it, etc. */
/* make sure that the event is relevant */
- if (evt.type != PropertyNotify)
+ if (evt->type != PropertyNotify)
return;
/* skip unless the property has a new value */
- if (evt.xproperty.state != PropertyNewValue)
+ if (evt->xproperty.state != PropertyNewValue)
return;
/* check size and format of the property */
@@ -1713,7 +1714,7 @@
XNextEvent(m_display, &evt);
/* fetch the selection, or part of it */
- getClipboard_xcout(evt, sseln, target, &sel_buf, &sel_len, &context);
+ getClipboard_xcout(&evt, sseln, target, &sel_buf, &sel_len, &context);
/* fallback is needed. set XA_STRING to target and restart the loop. */
if (context == XCLIB_XCOUT_FALLBACK) {
Modified: branches/ge_dev/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- branches/ge_dev/intern/ghost/intern/GHOST_SystemX11.h 2013-07-19 22:07:38 UTC (rev 58420)
+++ branches/ge_dev/intern/ghost/intern/GHOST_SystemX11.h 2013-07-19 22:10:11 UTC (rev 58421)
@@ -238,7 +238,7 @@
#endif
/* Helped function for get data from the clipboard. */
- void getClipboard_xcout(XEvent evt, Atom sel, Atom target,
+ void getClipboard_xcout(const XEvent *evt, Atom sel, Atom target,
unsigned char **txt, unsigned long *len,
unsigned int *context) const;
Modified: branches/ge_dev/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/ge_dev/intern/ghost/intern/GHOST_WindowCocoa.mm 2013-07-19 22:07:38 UTC (rev 58420)
+++ branches/ge_dev/intern/ghost/intern/GHOST_WindowCocoa.mm 2013-07-19 22:10:11 UTC (rev 58421)
@@ -1032,7 +1032,8 @@
[m_window zoom:nil];
break;
- case GHOST_kWindowStateFullScreen: {
+ case GHOST_kWindowStateFullScreen:
+ {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
NSUInteger masks = [m_window styleMask];
Modified: branches/ge_dev/intern/opencl/OCL_opencl.h
===================================================================
--- branches/ge_dev/intern/opencl/OCL_opencl.h 2013-07-19 22:07:38 UTC (rev 58420)
+++ branches/ge_dev/intern/opencl/OCL_opencl.h 2013-07-19 22:10:11 UTC (rev 58421)
@@ -28,7 +28,7 @@
#endif
#include "intern/clew.h"
-void OCL_init(void);
+int OCL_init(void);
#ifdef __cplusplus
}
Modified: branches/ge_dev/intern/opencl/intern/OCL_opencl.c
===================================================================
--- branches/ge_dev/intern/opencl/intern/OCL_opencl.c 2013-07-19 22:07:38 UTC (rev 58420)
+++ branches/ge_dev/intern/opencl/intern/OCL_opencl.c 2013-07-19 22:10:11 UTC (rev 58421)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list