[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58731] branches/soc-2013-cycles_mblur: Merged trunk into branch.

Gavin Howard gavin.d.howard at gmail.com
Tue Jul 30 01:27:11 CEST 2013


Revision: 58731
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58731
Author:   gdh
Date:     2013-07-29 23:27:10 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58706 to r58730.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58706
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58730

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/doc/python_api/rst/bge.render.rst
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp
    branches/soc-2013-cycles_mblur/intern/ghost/GHOST_C-api.h
    branches/soc-2013-cycles_mblur/intern/ghost/GHOST_IWindow.h
    branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_Window.h
    branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_interp.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_connect_nonplanar.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2013-cycles_mblur/source/blender/collada/DocumentImporter.cpp
    branches/soc-2013-cycles_mblur/source/blender/collada/TransformReader.cpp
    branches/soc-2013-cycles_mblur/source/blender/collada/collada_internal.cpp
    branches/soc-2013-cycles_mblur/source/blender/collada/collada_internal.h
    branches/soc-2013-cycles_mblur/source/blender/collada/collada_utils.cpp
    branches/soc-2013-cycles_mblur/source/blender/collada/collada_utils.h
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-cycles_mblur/source/blender/editors/render/render_preview.c
    branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_select.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/makesrna.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/soc-2013-cycles_mblur/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_api.h
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/wm_window.h
    branches/soc-2013-cycles_mblur/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2013-cycles_mblur/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_ICanvas.h

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58705
   + /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58730

Modified: branches/soc-2013-cycles_mblur/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/soc-2013-cycles_mblur/doc/python_api/rst/bge.render.rst	2013-07-29 22:36:51 UTC (rev 58730)
+++ branches/soc-2013-cycles_mblur/doc/python_api/rst/bge.render.rst	2013-07-29 23:27:10 UTC (rev 58731)
@@ -62,7 +62,19 @@
 .. data:: KX_BLENDER_GLSL_MATERIAL
 
    Materials approximating blender materials with GLSL.
+   
+.. DATA:: VSYNC_OFF
 
+   Disables vsync
+
+.. DATA:: VSYNC_ON
+
+   Enables vsync
+
+.. DATA:: VSYNC_ADAPTIVE
+
+   Enables adaptive vsync if supported. Adaptive vsync enables vsync if the framerate is above the monitors refresh rate. Otherwise, vsync is diabled if the framerate is too low.
+
 *********
 Functions
 *********
@@ -289,3 +301,15 @@
 
    Disable the motion blur effect.
 
+.. function:: setVsync(value)
+
+   Set the vsync value
+
+   :arg value: One of VSYNC_OFF, VSYNC_ON, VSYNC_ADAPTIVE
+   :type value: integer
+
+.. function:: getVsync()
+
+   Get the current vsync value
+
+   :rtype: One of VSYNC_OFF, VSYNC_ON, VSYNC_ADAPTIVE

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_mesh.cpp	2013-07-29 22:36:51 UTC (rev 58730)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_mesh.cpp	2013-07-29 23:27:10 UTC (rev 58731)
@@ -463,7 +463,6 @@
 	mesh_synced.insert(mesh);
 
 	/* create derived mesh */
-	bool need_undeformed = mesh->need_attribute(scene, ATTR_STD_GENERATED);
 	PointerRNA cmesh = RNA_pointer_get(&b_ob_data.ptr, "cycles");
 
 	vector<Mesh::Triangle> oldtriangle = mesh->triangles;
@@ -480,6 +479,7 @@
 		if(preview)
 			b_ob.update_from_editmode();
 
+		bool need_undeformed = mesh->need_attribute(scene, ATTR_STD_GENERATED);
 		BL::Mesh b_mesh = object_to_mesh(b_data, b_ob, b_scene, true, !preview, need_undeformed);
 
 		if(b_mesh) {

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp	2013-07-29 22:36:51 UTC (rev 58730)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp	2013-07-29 23:27:10 UTC (rev 58731)
@@ -279,6 +279,11 @@
 
 	BL::RenderResult::layers_iterator b_single_rlay;
 	b_rr.layers.begin(b_single_rlay);
+
+	/* layer will be missing if it was disabled in the UI */
+	if(b_single_rlay == b_rr.layers.end())
+		return;
+
 	BL::RenderLayer b_rlay = *b_single_rlay;
 
 	if (do_update_only) {

Modified: branches/soc-2013-cycles_mblur/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/ghost/GHOST_C-api.h	2013-07-29 22:36:51 UTC (rev 58730)
+++ branches/soc-2013-cycles_mblur/intern/ghost/GHOST_C-api.h	2013-07-29 23:27:10 UTC (rev 58731)
@@ -666,6 +666,19 @@
 extern GHOST_TSuccess GHOST_SwapWindowBuffers(GHOST_WindowHandle windowhandle);
 
 /**
+ * Sets the swap interval for swapBuffers.
+ * \param interval The swap interval to use.
+ * \return A boolean success indicator.
+ */
+extern GHOST_TSuccess GHOST_SetSwapInterval(GHOST_WindowHandle windowhandle, int interval);
+
+/**
+ * Gets the current swap interval for swapBuffers.
+ * \return An integer.
+ */
+extern int GHOST_GetSwapInterval(GHOST_WindowHandle windowhandle);
+
+/**
  * Activates the drawing context of this window.
  * \param windowhandle The handle to the window
  * \return An intean success indicator.

Modified: branches/soc-2013-cycles_mblur/intern/ghost/GHOST_IWindow.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/ghost/GHOST_IWindow.h	2013-07-29 22:36:51 UTC (rev 58730)
+++ branches/soc-2013-cycles_mblur/intern/ghost/GHOST_IWindow.h	2013-07-29 23:27:10 UTC (rev 58731)
@@ -205,6 +205,19 @@
 	virtual GHOST_TSuccess swapBuffers() = 0;
 
 	/**
+	 * Sets the swap interval for swapBuffers.
+	 * \param interval The swap interval to use.
+	 * \return A boolean success indicator.
+	 */
+	virtual GHOST_TSuccess setSwapInterval(int interval) = 0;
+
+	/**
+	 * Gets the current swap interval for swapBuffers.
+	 * \return An integer.
+	 */
+	virtual int getSwapInterval() = 0;
+
+	/**
 	 * Activates the drawing context of this window.
 	 * \return  A boolean success indicator.
 	 */

Modified: branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_C-api.cpp	2013-07-29 22:36:51 UTC (rev 58730)
+++ branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_C-api.cpp	2013-07-29 23:27:10 UTC (rev 58731)
@@ -691,8 +691,21 @@
 	return window->swapBuffers();
 }
 
+GHOST_TSuccess GHOST_SetSwapInterval(GHOST_WindowHandle windowhandle, int interval)
+{
+	GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
 
+	return window->setSwapInterval(interval);
+}
 
+int GHOST_GetSwapInterval(GHOST_WindowHandle windowhandle)
+{
+	GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
+
+	return window->getSwapInterval();
+}
+
+
 GHOST_TSuccess GHOST_ActivateWindowDrawingContext(GHOST_WindowHandle windowhandle)
 {
 	GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;

Modified: branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_Window.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_Window.h	2013-07-29 22:36:51 UTC (rev 58730)
+++ branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_Window.h	2013-07-29 23:27:10 UTC (rev 58731)
@@ -67,6 +67,8 @@
 	 * virtual GHOST_TWindowOrder getOrder(void) = 0;
 	 * virtual GHOST_TSuccess setOrder(GHOST_TWindowOrder order) = 0;
 	 * virtual GHOST_TSuccess swapBuffers() = 0;
+	 * virtual GHOST_TSuccess setSwapInterval() = 0;
+	 * virtual int getSwapInterval() = 0;
 	 * virtual GHOST_TSuccess activateDrawingContext() = 0;
 	 * virtual GHOST_TSuccess invalidate() = 0;
 	 */
@@ -110,6 +112,8 @@
 	 * virtual GHOST_TSuccess setState(GHOST_TWindowState state) = 0;
 	 * virtual GHOST_TSuccess setOrder(GHOST_TWindowOrder order) = 0;
 	 * virtual GHOST_TSuccess swapBuffers() = 0;
+	 * virtual GHOST_TSuccess setSwapInterval() = 0;
+	 * virtual int getSwapInterval() = 0;
 	 * virtual GHOST_TSuccess activateDrawingContext() = 0;
 	 * virtual GHOST_TSuccess invalidate() = 0;
 	 */
@@ -205,6 +209,23 @@
 	}
 	
 	/**
+	 * Sets the swap interval for swapBuffers.
+	 * \param interval The swap interval to use.
+	 * \return A boolean success indicator.
+	 */
+	virtual GHOST_TSuccess setSwapInterval(int interval) {
+		return GHOST_kFailure;
+	}
+	
+	/**
+	 * Gets the current swap interval for swapBuffers.
+	 * \return An integer.
+	 */
+	virtual int getSwapInterval() {
+		return 0;
+	}
+	
+	/**
 	 * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop
 	 */
 	virtual void setAcceptDragOperation(bool canAccept);

Modified: branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-07-29 22:36:51 UTC (rev 58730)
+++ branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-07-29 23:27:10 UTC (rev 58731)
@@ -648,7 +648,21 @@
 	return ::SwapBuffers(hDC) == TRUE ? GHOST_kSuccess : GHOST_kFailure;
 }
 
+GHOST_TSuccess GHOST_WindowWin32::setSwapInterval(int interval)
+{
+	if (!WGL_EXT_swap_control)
+		return GHOST_kFailure;
+	return wglSwapIntervalEXT(interval) == TRUE ? GHOST_kSuccess : GHOST_kFailure;
+}
 
+int GHOST_WindowWin32::getSwapInterval()
+{
+	if (WGL_EXT_swap_control)
+		return wglGetSwapIntervalEXT();
+
+	return 0;
+}
+
 GHOST_TSuccess GHOST_WindowWin32::activateDrawingContext()
 {
 	GHOST_TSuccess success;

Modified: branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowWin32.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowWin32.h	2013-07-29 22:36:51 UTC (rev 58730)
+++ branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowWin32.h	2013-07-29 23:27:10 UTC (rev 58731)
@@ -212,6 +212,19 @@
 	virtual GHOST_TSuccess swapBuffers();
 
 	/**
+	 * Sets the swap interval for swapBuffers.
+	 * \param interval The swap interval to use.
+	 * \return A boolean success indicator.
+	 */
+	virtual GHOST_TSuccess setSwapInterval(int interval);
+
+	/**

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list