Mon Mar 4 13:39:32 CET 2013

Revision: 55016
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55016
Author:   campbellbarton
Date:     2013-03-04 12:39:31 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
svn merge ^/trunk/blender  -c54733 -c54738 -c54745 -c54746 -c54748 -c54754 -c54757 -c54760 -c54764 -c54766 -c54767 -c54769 -c54772 -c54776 -c54777 -c54780 -c54781 -c54782 -c54783 -c54788 -c54789 -c54790 -c54793 -c54794 -c54799 -c54816 -c54818 -c54822 -c54824 -c54827 -c54828 -c54833 -c54834 -c54835 -c54837 -c54855 -c54856 -c54862 -c54865 -c54866 -c54868 -c54875 -c54877 -c54878 -c54879 -c54882 -c54883 -c54885 -c54891 -c54899 -c54900 -c54901 -c54903 -c54907 -c54908 -c54910 -c54912 -c54917 -c54920 -c54921 -c54923 -c54928 -c54934 -c54935 -c54942 -c54943 -c54944 -c54945 -c54946 -c54948 -c54954 -c54959 -c54960 -c54961 -c54965 -c54971 -c54972 -c54990 -c54991 -c54993 -c54996 -c55004 -c55007 -c55010 -c55011 -c55012

Modified Paths:
--------------
    tags/blender-2.66a-release/blender/intern/cycles/blender/blender_object.cpp
    tags/blender-2.66a-release/blender/intern/cycles/render/object.cpp
    tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
    tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
    tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
    tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_WindowX11.cpp
    tags/blender-2.66a-release/blender/release/scripts/modules/bpy_extras/keyconfig_utils.py
    tags/blender-2.66a-release/blender/release/scripts/modules/console/intellisense.py
    tags/blender-2.66a-release/blender/release/scripts/startup/bl_operators/object.py
    tags/blender-2.66a-release/blender/release/scripts/startup/bl_operators/wm.py
    tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/space_view3d.py
    tags/blender-2.66a-release/blender/release/scripts/templates_py/operator_modal_timer.py
    tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_report.h
    tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_rigidbody.h
    tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_sequencer.h
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/DerivedMesh.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/anim.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/editderivedmesh.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/mask.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/mesh.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/movieclip.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/node.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/object.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/rigidbody.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/scene.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/seqmodifier.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/sequencer.c
    tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/text.c
    tags/blender-2.66a-release/blender/source/blender/blenloader/intern/readfile.c
    tags/blender-2.66a-release/blender/source/blender/collada/ControllerExporter.cpp
    tags/blender-2.66a-release/blender/source/blender/compositor/nodes/COM_ImageNode.cpp
    tags/blender-2.66a-release/blender/source/blender/editors/include/ED_view3d.h
    tags/blender-2.66a-release/blender/source/blender/editors/include/UI_interface.h
    tags/blender-2.66a-release/blender/source/blender/editors/interface/interface_handlers.c
    tags/blender-2.66a-release/blender/source/blender/editors/interface/interface_templates.c
    tags/blender-2.66a-release/blender/source/blender/editors/interface/interface_widgets.c
    tags/blender-2.66a-release/blender/source/blender/editors/interface/resources.c
    tags/blender-2.66a-release/blender/source/blender/editors/interface/view2d_ops.c
    tags/blender-2.66a-release/blender/source/blender/editors/mesh/editface.c
    tags/blender-2.66a-release/blender/source/blender/editors/mesh/editmesh_select.c
    tags/blender-2.66a-release/blender/source/blender/editors/mesh/meshtools.c
    tags/blender-2.66a-release/blender/source/blender/editors/object/object_add.c
    tags/blender-2.66a-release/blender/source/blender/editors/object/object_modifier.c
    tags/blender-2.66a-release/blender/source/blender/editors/physics/physics_pointcache.c
    tags/blender-2.66a-release/blender/source/blender/editors/screen/area.c
    tags/blender-2.66a-release/blender/source/blender/editors/screen/screen_ops.c
    tags/blender-2.66a-release/blender/source/blender/editors/screen/screendump.c
    tags/blender-2.66a-release/blender/source/blender/editors/sculpt_paint/paint_intern.h
    tags/blender-2.66a-release/blender/source/blender/editors/sculpt_paint/paint_ops.c
    tags/blender-2.66a-release/blender/source/blender/editors/sculpt_paint/paint_utils.c
    tags/blender-2.66a-release/blender/source/blender/editors/sculpt_paint/paint_vertex.c
    tags/blender-2.66a-release/blender/source/blender/editors/sculpt_paint/sculpt.c
    tags/blender-2.66a-release/blender/source/blender/editors/space_clip/clip_buttons.c
    tags/blender-2.66a-release/blender/source/blender/editors/space_image/image_intern.h
    tags/blender-2.66a-release/blender/source/blender/editors/space_image/image_ops.c
    tags/blender-2.66a-release/blender/source/blender/editors/space_image/space_image.c
    tags/blender-2.66a-release/blender/source/blender/editors/space_node/drawnode.c
    tags/blender-2.66a-release/blender/source/blender/editors/space_outliner/outliner_tools.c
    tags/blender-2.66a-release/blender/source/blender/editors/space_text/text_format.c
    tags/blender-2.66a-release/blender/source/blender/editors/space_view3d/view3d_project.c
    tags/blender-2.66a-release/blender/source/blender/editors/transform/transform.c
    tags/blender-2.66a-release/blender/source/blender/editors/transform/transform.h
    tags/blender-2.66a-release/blender/source/blender/editors/transform/transform_conversions.c
    tags/blender-2.66a-release/blender/source/blender/editors/transform/transform_manipulator.c
    tags/blender-2.66a-release/blender/source/blender/editors/uvedit/uvedit_ops.c
    tags/blender-2.66a-release/blender/source/blender/imbuf/intern/jp2.c
    tags/blender-2.66a-release/blender/source/blender/imbuf/intern/png.c
    tags/blender-2.66a-release/blender/source/blender/makesdna/DNA_node_types.h
    tags/blender-2.66a-release/blender/source/blender/makesdna/DNA_rigidbody_types.h
    tags/blender-2.66a-release/blender/source/blender/makesrna/intern/rna_access.c
    tags/blender-2.66a-release/blender/source/blender/makesrna/intern/rna_image.c
    tags/blender-2.66a-release/blender/source/blender/makesrna/intern/rna_nodetree.c
    tags/blender-2.66a-release/blender/source/blender/makesrna/intern/rna_rigidbody.c
    tags/blender-2.66a-release/blender/source/blender/makesrna/intern/rna_scene.c
    tags/blender-2.66a-release/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
    tags/blender-2.66a-release/blender/source/blender/modifiers/intern/MOD_solidify.c
    tags/blender-2.66a-release/blender/source/blender/modifiers/intern/MOD_subsurf.c
    tags/blender-2.66a-release/blender/source/blender/nodes/intern/node_exec.c
    tags/blender-2.66a-release/blender/source/blender/python/intern/bpy_rna.c
    tags/blender-2.66a-release/blender/source/blender/render/intern/source/multires_bake.c
    tags/blender-2.66a-release/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Converter/CMakeLists.txt
    tags/blender-2.66a-release/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Ketsji/BL_Action.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Ketsji/BL_BlenderShader.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Ketsji/CMakeLists.txt
    tags/blender-2.66a-release/blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
    tags/blender-2.66a-release/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    tags/blender-2.66a-release/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.h
    tags/blender-2.66a-release/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.h
    tags/blender-2.66a-release/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h
    tags/blender-2.66a-release/blender/source/tests/CMakeLists.txt

Removed Paths:
-------------
    tags/blender-2.66a-release/blender/source/gameengine/Converter/KX_IpoConvert.cpp
    tags/blender-2.66a-release/blender/source/gameengine/Converter/KX_IpoConvert.h

Property Changed:
----------------
    tags/blender-2.66a-release/blender/
    tags/blender-2.66a-release/blender/source/blender/editors/interface/interface.c
    tags/blender-2.66a-release/blender/source/blender/editors/space_outliner/


Property changes on: tags/blender-2.66a-release/blender
___________________________________________________________________
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
   + /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
/trunk/blender:54733,54738,54745-54746,54748,54754,54757,54760,54764,54766-54767,54769,54772,54776-54777,54780-54783,54788-54790,54793-54794,54799,54816,54818,54822,54824,54827-54828,54833-54835,54837,54855-54856,54862,54865-54866,54868,54875,54877-54879,54882-54883,54885,54891,54899-54901,54903,54907-54908,54910,54912,54917,54920-54921,54923,54928,54934-54935,54942-54946,54948,54954,54959-54961,54965,54969,54971-54972,54990-54991,54993,54996,55004,55007,55010-55012

Modified: tags/blender-2.66a-release/blender/intern/cycles/blender/blender_object.cpp
===================================================================

--- tags/blender-2.66a-release/blender/intern/cycles/blender/blender_object.cpp	2013-03-04 11:43:44 UTC (rev 55015)
+++ tags/blender-2.66a-release/blender/intern/cycles/blender/blender_object.cpp	2013-03-04 12:39:31 UTC (rev 55016)
@@ -311,13 +311,48 @@
 	return object;
 }
 
-static bool object_dupli_hide_original(BL::Object::dupli_type_enum dupli_type)
+static bool object_render_hide_original(BL::Object::dupli_type_enum dupli_type)
 {
 	return (dupli_type == BL::Object::dupli_type_VERTS ||
 	        dupli_type == BL::Object::dupli_type_FACES ||
 	        dupli_type == BL::Object::dupli_type_FRAMES);
 }
 
+static bool object_render_hide(BL::Object b_ob, bool top_level, bool parent_hide, bool& hide_triangles)
+{
+	/* check if we should render or hide particle emitter */
+	BL::Object::particle_systems_iterator b_psys;
+
+	bool hair_present = false;
+	bool show_emitter = false;
+	bool hide = false;
+
+	for(b_ob.particle_systems.begin(b_psys); b_psys != b_ob.particle_systems.end(); ++b_psys) {
+		if((b_psys->settings().render_type() == BL::ParticleSettings::render_type_PATH) &&
+		   (b_psys->settings().type()==BL::ParticleSettings::type_HAIR))
+			hair_present = true;
+
+		if(b_psys->settings().use_render_emitter()) {
+			hide = false;
+			show_emitter = true;
+		}
+	}
+
+	/* duplicators hidden by default, except dupliframes which duplicate self */
+	if(b_ob.is_duplicator())
+		if(top_level || b_ob.dupli_type() != BL::Object::dupli_type_FRAMES)
+			hide = true;
+
+	/* hide original object for duplis */
+	BL::Object parent = b_ob.parent();
+	if(parent && object_render_hide_original(parent.dupli_type()))
+		if(parent_hide)
+			hide = true;
+
+	hide_triangles = (hair_present && !show_emitter);
+	return hide && !show_emitter;
+}
+
 /* Object Loop */
 
 void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, int motion)
@@ -353,9 +388,6 @@
 				progress.set_sync_status("Synchronizing object", (*b_ob).name());
 
 				if(b_ob->is_duplicator()) {
-					/* duplicators hidden by default */
-					hide = true;
-
 					/* dupli objects */
 					b_ob->dupli_list_create(b_scene, 2);
 
@@ -365,33 +397,16 @@
 						Transform tfm = get_transform(b_dup->matrix());
 						BL::Object b_dup_ob = b_dup->object();
 						bool dup_hide = (b_v3d)? b_dup_ob.hide(): b_dup_ob.hide_render();
-						bool emitter_hide = false;
+						bool in_dupli_group = (b_dup->type() == BL::DupliObject::type_GROUP);
+						bool hide_tris;
 
-						if(b_dup_ob.is_duplicator()) {
-							/* duplicators hidden by default, except dupliframes which duplicate self */
-							if(b_dup_ob.dupli_type() != BL::Object::dupli_type_FRAMES)
-								emitter_hide = true;
-							
-							/* check if we should render or hide particle emitter */
-							BL::Object::particle_systems_iterator b_psys;
-							for(b_dup_ob.particle_systems.begin(b_psys); b_psys != b_dup_ob.particle_systems.end(); ++b_psys)
-								if(b_psys->settings().use_render_emitter())
-									emitter_hide = false;
-						}
-
-						/* hide original object for duplis */
-						BL::Object parent = b_dup_ob.parent();
-						if(parent && object_dupli_hide_original(parent.dupli_type()))
-							if(b_dup->type() == BL::DupliObject::type_GROUP)
-								dup_hide = true;
-
-						if(!(b_dup->hide() || dup_hide || emitter_hide)) {
+						if(!(b_dup->hide() || dup_hide || object_render_hide(b_dup_ob, false, in_dupli_group, hide_tris))) {
 							/* the persistent_id allows us to match dupli objects
 							 * between frames and updates */
 							BL::Array<int, OBJECT_PERSISTENT_ID_SIZE> persistent_id = b_dup->persistent_id();
 
 							/* sync object and mesh or light data */
-							Object *object = sync_object(*b_ob, persistent_id.data, *b_dup, tfm, ob_layer, motion, false);
+							Object *object = sync_object(*b_ob, persistent_id.data, *b_dup, tfm, ob_layer, motion, hide_tris);
 
 							/* sync possible particle data, note particle_id
 							 * starts counting at 1, first is dummy particle */
@@ -410,33 +425,10 @@
 					b_ob->dupli_list_clear();
 				}
 
-				/* check if we should render or hide particle emitter */
-				BL::Object::particle_systems_iterator b_psys;
+				/* test if object needs to be hidden */
+				bool hide_tris;
 
-				bool hair_present = false;
-				bool show_emitter = false;
-				bool hide_tris = false;
-
-				for(b_ob->particle_systems.begin(b_psys); b_psys != b_ob->particle_systems.end(); ++b_psys) {
-
-					if((b_psys->settings().render_type()==BL::ParticleSettings::render_type_PATH)&&(b_psys->settings().type()==BL::ParticleSettings::type_HAIR))
-						hair_present = true;
-
-					if(b_psys->settings().use_render_emitter()) {
-						hide = false;
-						show_emitter = true;
-					}
-				}
-
-				if(hair_present && !show_emitter)
-					hide_tris = true;
-
-				/* hide original object for duplis */
-				BL::Object parent = b_ob->parent();
-				if(parent && object_dupli_hide_original(parent.dupli_type()))
-					hide = true;
-
-				if(!hide) {
+				if(!object_render_hide(*b_ob, true, true, hide_tris)) {
 					/* object itself */
 					Transform tfm = get_transform(b_ob->matrix_world());
 					sync_object(*b_ob, NULL, PointerRNA_NULL, tfm, ob_layer, motion, hide_tris);

Modified: tags/blender-2.66a-release/blender/intern/cycles/render/object.cpp
===================================================================
--- tags/blender-2.66a-release/blender/intern/cycles/render/object.cpp	2013-03-04 11:43:44 UTC (rev 55015)
+++ tags/blender-2.66a-release/blender/intern/cycles/render/object.cpp	2013-03-04 12:39:31 UTC (rev 55016)
@@ -301,6 +301,8 @@
 	
 	device_free(device, dscene);
 
+	need_update = false;
+
 	if(scene->objects.size() == 0)
 		return;
 
@@ -322,8 +324,6 @@
 
 	/* allocate object flag */
 	device->tex_alloc("__object_flag", dscene->object_flag);
-
-	need_update = false;
 }
 
 void ObjectManager::device_free(Device *device, DeviceScene *dscene)

Modified: tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2013-03-04 11:43:44 UTC (rev 55015)
+++ tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2013-03-04 12:39:31 UTC (rev 55016)
@@ -217,8 +217,8 @@
 
 void GHOST_SystemWin32::getAllDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const
 {
-	width = ::GetSystemMetrics(SM_XVIRTUALSCREEN);
-	height = ::GetSystemMetrics(SM_YVIRTUALSCREEN);
+	width = ::GetSystemMetrics(SM_CXVIRTUALSCREEN);
+	height = ::GetSystemMetrics(SM_CYVIRTUALSCREEN);
 }
 
 GHOST_IWindow *GHOST_SystemWin32::createWindow(

Modified: tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-03-04 11:43:44 UTC (rev 55015)
+++ tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-03-04 12:39:31 UTC (rev 55016)
@@ -514,6 +514,8 @@
 	pixelFormatAttrsWindow[i++] = NSOpenGLPFADepthSize;
 	pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 32;
 	
+	pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccumSize;
+	pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 32;
 	
 	if (stereoVisual) pixelFormatAttrsWindow[i++] = NSOpenGLPFAStereo;
 	
@@ -556,6 +558,9 @@
 		
 		pixelFormatAttrsWindow[i++] = NSOpenGLPFADepthSize;
 		pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 32;
+
+		pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccumSize;
+		pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 32;
 		
 		if (stereoVisual) pixelFormatAttrsWindow[i++] = NSOpenGLPFAStereo;
 		

Modified: tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-03-04 11:43:44 UTC (rev 55015)
+++ tags/blender-2.66a-release/blender/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-03-04 12:39:31 UTC (rev 55016)
@@ -712,6 +712,7 @@
 		WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB,
 		WGL_COLOR_BITS_ARB, pfd.cColorBits,
 		WGL_DEPTH_BITS_ARB, pfd.cDepthBits,
+		WGL_ALPHA_BITS_ART, pfd.cAlphaBits,
 		WGL_STENCIL_BITS_ARB, pfd.cStencilBits,

@@ Diff output truncated at 10240 characters. @@

