[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43640] branches/bmesh/blender: svn merge ^/trunk/blender -r43616:43639

Campbell Barton ideasman42 at gmail.com
Mon Jan 23 17:46:40 CET 2012


Revision: 43640
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43640
Author:   campbellbarton
Date:     2012-01-23 16:46:35 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43616:43639

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

Modified Paths:
--------------
    branches/bmesh/blender/doc/python_api/rst/bge.render.rst
    branches/bmesh/blender/intern/boolop/SConscript
    branches/bmesh/blender/intern/cycles/blender/addon/ui.py
    branches/bmesh/blender/intern/ghost/GHOST_ISystem.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_System.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_System.h
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
    branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c
    branches/bmesh/blender/source/blender/blenkernel/intern/implicit.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
    branches/bmesh/blender/source/blender/editors/space_outliner/outliner_draw.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
    branches/bmesh/blender/source/blender/makesdna/DNA_cloth_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_object_force.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_cloth.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
    branches/bmesh/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/bmesh/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/bmesh/blender/source/gameengine/GamePlayer/common/GPC_Canvas.h
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_ICanvas.h

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /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
/trunk/blender:39992-43616
   + /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
/trunk/blender:39992-43639

Modified: branches/bmesh/blender/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/bge.render.rst	2012-01-23 16:32:11 UTC (rev 43639)
+++ branches/bmesh/blender/doc/python_api/rst/bge.render.rst	2012-01-23 16:46:35 UTC (rev 43640)
@@ -77,6 +77,14 @@
    
    :rtype: integer
 
+.. function:: setWindowSize(width, height)
+
+   Set the width and height of the window (in pixels). This also works for fullscreen applications.
+   
+   :type width: integer
+   :type height: integer
+
+
 .. function:: makeScreenshot(filename)
 
    Writes a screenshot to the given filename.

Modified: branches/bmesh/blender/intern/boolop/SConscript
===================================================================
--- branches/bmesh/blender/intern/boolop/SConscript	2012-01-23 16:32:11 UTC (rev 43639)
+++ branches/bmesh/blender/intern/boolop/SConscript	2012-01-23 16:46:35 UTC (rev 43640)
@@ -8,6 +8,7 @@
 defs = []
 
 if not env['WITH_BF_CARVE']:
+    import os
     sources = env.Glob('intern/*.cpp')
     sources.remove('intern' + os.sep + 'BOP_CarveInterface.cpp')
 else:

Modified: branches/bmesh/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/ui.py	2012-01-23 16:32:11 UTC (rev 43639)
+++ branches/bmesh/blender/intern/cycles/blender/addon/ui.py	2012-01-23 16:46:35 UTC (rev 43640)
@@ -337,18 +337,15 @@
         ob = context.object
         visibility = ob.cycles_visibility
 
-        split = layout.split()
+        flow = layout.column_flow()
+        
+        flow.prop(visibility, "camera")
+        flow.prop(visibility, "diffuse")
+        flow.prop(visibility, "glossy")
+        flow.prop(visibility, "transmission")
+        flow.prop(visibility, "shadow")
 
-        col = split.column()
-        col.prop(visibility, "camera")
-        col.prop(visibility, "diffuse")
-        col.prop(visibility, "glossy")
 
-        col = split.column()
-        col.prop(visibility, "transmission")
-        col.prop(visibility, "shadow")
-
-
 def find_node(material, nodetype):
     if material and material.node_tree:
         ntree = material.node_tree
@@ -473,18 +470,14 @@
         world = context.world
         cworld = world.cycles
 
-        split = layout.split()
-        col = split.column()
+        col = layout.column()
 
         col.prop(cworld, "sample_as_light")
         row = col.row()
         row.active = cworld.sample_as_light
         row.prop(cworld, "sample_map_resolution")
 
-        col = split.column()
-        col.label()
 
-
 class CyclesWorld_PT_volume(CyclesButtonsPanel, Panel):
     bl_label = "Volume"
     bl_context = "world"
@@ -617,16 +610,11 @@
                 col.template_ID(user, "texture", new="texture.new")
 
             if tex:
-                row = split.row()
-                row.prop(tex, "use_nodes", icon="NODETREE", text="")
-                row.label()
+                split = layout.split(percentage=0.2)
+                split.label(text="Type:")
+                split.prop(tex, "type", text="")
 
-                if not tex.use_nodes:
-                    split = layout.split(percentage=0.2)
-                    split.label(text="Type:")
-                    split.prop(tex, "type", text="")
 
-
 class CyclesTexture_PT_nodes(CyclesButtonsPanel, Panel):
     bl_label = "Nodes"
     bl_context = "texture"

Modified: branches/bmesh/blender/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/bmesh/blender/intern/ghost/GHOST_ISystem.h	2012-01-23 16:32:11 UTC (rev 43639)
+++ branches/bmesh/blender/intern/ghost/GHOST_ISystem.h	2012-01-23 16:46:35 UTC (rev 43640)
@@ -271,6 +271,15 @@
 	 */
 	virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
 		const bool stereoVisual, const GHOST_TUns16 numOfAASamples=0) = 0;
+	
+	/**
+	 * Updates the resolution while in fullscreen mode.
+	 * @param setting	The new setting of the display.
+	 * @param window	Window displayed in full screen.
+	 *
+	 * @return	Indication of success.
+	 */
+	virtual GHOST_TSuccess updateFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window) = 0;
 
 	/**
 	 * Ends full screen mode.

Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_System.cpp	2012-01-23 16:32:11 UTC (rev 43639)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_System.cpp	2012-01-23 16:46:35 UTC (rev 43640)
@@ -168,6 +168,19 @@
 }
 
 
+GHOST_TSuccess GHOST_System::updateFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window)
+{
+	GHOST_TSuccess success = GHOST_kFailure;
+	GHOST_ASSERT(m_windowManager, "GHOST_System::updateFullScreen(): invalid window manager");
+	if(m_displayManager) {
+		if (m_windowManager->getFullScreen()) {
+			success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, setting);
+		}
+	}
+
+	return success;
+}
+
 GHOST_TSuccess GHOST_System::endFullScreen(void)
 {
 	GHOST_TSuccess success = GHOST_kFailure;

Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_System.h
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_System.h	2012-01-23 16:32:11 UTC (rev 43639)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_System.h	2012-01-23 16:46:35 UTC (rev 43640)
@@ -145,6 +145,15 @@
 	 */
 	virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
 		const bool stereoVisual, const GHOST_TUns16 numOfAASamples=0);
+		
+	/**
+	 * Updates the resolution while in fullscreen mode.
+	 * @param setting	The new setting of the display.
+	 * @param window	Window displayed in full screen.
+	 *
+	 * @return	Indication of success.
+	 */
+	virtual GHOST_TSuccess updateFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window);
 
 	/**
 	 * Ends full screen mode.


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,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611
   + /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43639

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py	2012-01-23 16:32:11 UTC (rev 43639)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py	2012-01-23 16:46:35 UTC (rev 43640)
@@ -87,6 +87,7 @@
         col.label(text="Damping:")
         col.prop(cloth, "spring_damping", text="Spring")
         col.prop(cloth, "air_damping", text="Air")
+        col.prop(cloth, "vel_damping", text="Velocity")
 
         col.prop(cloth, "use_pin_cloth", text="Pinning")
         sub = col.column()

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py	2012-01-23 16:32:11 UTC (rev 43639)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py	2012-01-23 16:46:35 UTC (rev 43640)
@@ -58,6 +58,9 @@
                 # Don't show "Use Nodes" Button when Engine is BI for Lamps
                 if snode_id and not (scene.render.use_shading_nodes == 0 and ob.type == 'LAMP'):
                     layout.prop(snode_id, "use_nodes")
+                    
+            if snode.shader_type == 'WORLD':
+                layout.template_ID(scene, "world", new="world.new")
 
         elif snode.tree_type == 'TEXTURE':
             layout.prop(snode, "texture_type", text="", expand=True)

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c	2012-01-23 16:32:11 UTC (rev 43639)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c	2012-01-23 16:46:35 UTC (rev 43640)
@@ -131,6 +131,7 @@
 	clmd->sim_parms->presets = 2; /* cotton as start setting */
 	clmd->sim_parms->timescale = 1.0f; /* speed factor, describes how fast cloth moves */
 	clmd->sim_parms->reset = 0;
+	clmd->sim_parms->vel_damping = 1.0f; /* 1.0 = no damping, 0.0 = fully dampened */
 	
 	clmd->coll_parms->self_friction = 5.0;
 	clmd->coll_parms->friction = 5.0;

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/implicit.c	2012-01-23 16:32:11 UTC (rev 43639)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/implicit.c	2012-01-23 16:46:35 UTC (rev 43640)
@@ -1852,6 +1852,9 @@
 	
 	while(step < tf)
 	{	
+		// damping velocity for artistic reasons
+		mul_lfvectorS(id->V, id->V, clmd->sim_parms->vel_damping, numverts);
+
 		// calculate forces

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list