[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50413] branches/soc-2011-tomato: Merging r50374 through r50412 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Wed Sep 5 13:42:21 CEST 2012


Revision: 50413
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50413
Author:   nazgul
Date:     2012-09-05 11:42:20 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
Merging r50374 through r50412 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
    branches/soc-2011-tomato/intern/cycles/app/cycles_test.cpp
    branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
    branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
    branches/soc-2011-tomato/intern/cycles/blender/blender_particles.cpp
    branches/soc-2011-tomato/intern/cycles/blender/blender_session.h
    branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-tomato/intern/cycles/blender/blender_sync.h
    branches/soc-2011-tomato/intern/cycles/blender/blender_util.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_displace.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_path.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_shader.h
    branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/CMakeLists.txt
    branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl
    branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_holdout.osl
    branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
    branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
    branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
    branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_shader.h
    branches/soc-2011-tomato/intern/cycles/render/camera.cpp
    branches/soc-2011-tomato/intern/cycles/render/camera.h
    branches/soc-2011-tomato/intern/cycles/render/nodes.cpp
    branches/soc-2011-tomato/intern/cycles/render/osl.cpp
    branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-tomato/release/scripts/templates/operator_modal.py
    branches/soc-2011-tomato/release/scripts/templates/operator_modal_draw.py
    branches/soc-2011-tomato/release/scripts/templates/operator_modal_timer.py
    branches/soc-2011-tomato/release/scripts/templates/operator_modal_view3d.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_armature.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_deform.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/deform.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/seqmodifier.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-tomato/source/blender/compositor/COM_compositor.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Device.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeBase.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Socket.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_compositor.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GroupNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-tomato/source/blender/editors/io/io_collada.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_toolbar.c
    branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_templates.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2011-tomato/source/blender/editors/util/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/imbuf/intern/moviecache.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-tomato/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h
    branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-tomato/source/blender/render/intern/source/external_engine.c
    branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-tomato/source/blender/render/intern/source/render_result.c
    branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-tomato/source/tests/pep8.py
    branches/soc-2011-tomato/source/tools/codereview_upload.py

Added Paths:
-----------
    branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_brick_texture.osl
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_object_deform.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/object_deform.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-50373
   + /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-50412

Modified: branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt	2012-09-05 09:33:15 UTC (rev 50412)
+++ branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt	2012-09-05 11:42:20 UTC (rev 50413)
@@ -314,6 +314,7 @@
 	src/BulletDynamics/Character/btKinematicCharacterController.h
 	
 	src/BulletSoftBody/btSoftBody.h
+	src/BulletSoftBody/btSoftBodyInternals.h
 	src/BulletSoftBody/btSoftBodyData.h
 	src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
 	src/BulletSoftBody/btSoftBodyHelpers.h
@@ -355,6 +356,7 @@
 	
 	src/btBulletCollisionCommon.h
 	src/btBulletDynamicsCommon.h
+	src/Bullet-C-Api.h
 )
 
 if(CMAKE_COMPILER_IS_GNUCXX)

Modified: branches/soc-2011-tomato/intern/cycles/app/cycles_test.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/app/cycles_test.cpp	2012-09-05 09:33:15 UTC (rev 50412)
+++ branches/soc-2011-tomato/intern/cycles/app/cycles_test.cpp	2012-09-05 11:42:20 UTC (rev 50413)
@@ -66,12 +66,13 @@
 
 static void session_print_status()
 {
-	int sample;
+	int sample, tile;
 	double total_time, sample_time;
 	string status, substatus;
 
 	/* get status */
-	options.session->progress.get_sample(sample, total_time, sample_time);
+	sample = options.session->progress.get_sample();
+	options.session->progress.get_tile(tile, total_time, sample_time);
 	options.session->progress.get_status(status, substatus);
 
 	if(substatus != "")
@@ -111,7 +112,7 @@
 
 static void scene_init(int width, int height)
 {
-	options.scene = new Scene(options.scene_params);
+	options.scene = new Scene(options.scene_params, options.session_params.device);
 	xml_read_file(options.scene, options.filepath.c_str());
 	
 	if (width == 0 || height == 0) {
@@ -147,11 +148,12 @@
 	latency = (elapsed - last);
 	last = elapsed;
 
-	int sample;
+	int sample, tile;
 	double total_time, sample_time;
 	string status, substatus;
 
-	progress.get_sample(sample, total_time, sample_time);
+	sample = progress.get_sample();
+	progress.get_tile(tile, total_time, sample_time);
 	progress.get_status(status, substatus);
 
 	if(substatus != "")

Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py	2012-09-05 09:33:15 UTC (rev 50412)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py	2012-09-05 11:42:20 UTC (rev 50413)
@@ -244,7 +244,7 @@
 
         cls.resolution_divider = IntProperty(
                 name="Resolution Divider",
-                description="Start viewport rendering with lower resolution which would be real resolution divided by two in power of this value",
+                description="For viewport render, the number of lower resolutions to render before the full resolution",
                 min=1, max=512,
                 default=4,
                 )

Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py	2012-09-05 09:33:15 UTC (rev 50412)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py	2012-09-05 11:42:20 UTC (rev 50413)
@@ -213,6 +213,8 @@
         sub.prop(cscene, "debug_use_spatial_splits")
         sub.prop(cscene, "use_cache")
 
+        sub = col.column(align=True)
+        sub.label(text="Viewport:")
         sub.prop(cscene, "resolution_divider")
 
 

Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp	2012-09-05 09:33:15 UTC (rev 50412)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp	2012-09-05 11:42:20 UTC (rev 50413)
@@ -305,8 +305,7 @@
 	for(; b_sce && !cancel; b_sce = b_sce.background_set()) {
 		for(b_sce.objects.begin(b_ob); b_ob != b_sce.objects.end() && !cancel; ++b_ob) {
 			bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render();
-			uint ob_layer = get_layer(b_ob->layers(), b_ob->layers_local_view(), object_is_light(*b_ob));
-			CYCLES_LOCAL_LAYER_HACK(render_layer.use_localview, ob_layer);
+			uint ob_layer = get_layer(b_ob->layers(), b_ob->layers_local_view(), render_layer.use_localview, object_is_light(*b_ob));
 			hide = hide || !(ob_layer & scene_layer);
 
 			if(!hide) {

Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_particles.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_particles.cpp	2012-09-05 09:33:15 UTC (rev 50412)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_particles.cpp	2012-09-05 11:42:20 UTC (rev 50413)
@@ -199,8 +199,7 @@
 	for(; b_sce; b_sce = b_sce.background_set()) {
 		for(b_sce.objects.begin(b_ob); b_ob != b_sce.objects.end(); ++b_ob) {
 			bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render();
-			uint ob_layer = get_layer(b_ob->layers(), b_ob->layers_local_view(), object_is_light(*b_ob));
-			CYCLES_LOCAL_LAYER_HACK(render_layer.use_localview, ob_layer);
+			uint ob_layer = get_layer(b_ob->layers(), b_ob->layers_local_view(), render_layer.use_localview, object_is_light(*b_ob));
 			hide = hide || !(ob_layer & scene_layer);
 
 			if(!hide) {

Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_session.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_session.h	2012-09-05 09:33:15 UTC (rev 50412)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_session.h	2012-09-05 11:42:20 UTC (rev 50413)
@@ -53,8 +53,7 @@
 	void write_render_tile(RenderTile& rtile);
 
 	/* update functions are used to update display buffer only after sample was rendered
-	 * only needed for better visual feedback
-	 */
+	 * only needed for better visual feedback */
 	void update_render_result(BL::RenderResult b_rr, BL::RenderLayer b_rlay, RenderTile& rtile);
 	void update_render_tile(RenderTile& rtile);
 

Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp	2012-09-05 09:33:15 UTC (rev 50412)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp	2012-09-05 11:42:20 UTC (rev 50413)
@@ -231,8 +231,7 @@
 		}
 		else {
 			render_layer.use_localview = (b_v3d.local_view() ? true : false);
-			render_layer.scene_layer = get_layer(b_v3d.layers(), b_v3d.layers_local_view());
-			CYCLES_LOCAL_LAYER_HACK(render_layer.use_localview, render_layer.scene_layer);
+			render_layer.scene_layer = get_layer(b_v3d.layers(), b_v3d.layers_local_view(), render_layer.use_localview);
 			render_layer.layer = render_layer.scene_layer;
 			render_layer.holdout_layer = 0;
 			render_layer.material_override = PointerRNA_NULL;
@@ -354,8 +353,6 @@
 
 	/* tiles */
 	if(params.device.type != DEVICE_CPU && !background) {
-		printf("%d\n", get_int(cscene, "debug_tile_size"));
-
 		/* currently GPU could be much slower than CPU when using tiles,
 		 * still need to be investigated, but meanwhile make it possible
 		 * to work in viewport smoothly

Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_sync.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_sync.h	2012-09-05 09:33:15 UTC (rev 50412)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_sync.h	2012-09-05 11:42:20 UTC (rev 50413)
@@ -137,20 +137,6 @@
 	Progress &progress;
 };
 
-/* we don't have spare bits for localview (normally 20-28)
- * because PATH_RAY_LAYER_SHIFT uses 20-32.
- * So - check if we have localview and if so, shift local
- * view bits down to 1-8, since this is done for the view
- * port only - it should be OK and not conflict with
- * render layers. - Campbell.
- *
- * ... as an alternative we could use uint64_t
- */
-#define CYCLES_LOCAL_LAYER_HACK(use_localview, layer)   \
-	if (use_localview) {                                \
-		layer >>= 20;                                   \
-	} (void)0
-
 CCL_NAMESPACE_END
 
 #endif /* __BLENDER_SYNC_H__ */

Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_util.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_util.h	2012-09-05 09:33:15 UTC (rev 50412)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_util.h	2012-09-05 11:42:20 UTC (rev 50413)
@@ -170,7 +170,7 @@
 	return layer;
 }
 
-static inline uint get_layer(BL::Array<int, 20> array, BL::Array<int, 8> local_array, bool is_light = false)
+static inline uint get_layer(BL::Array<int, 20> array, BL::Array<int, 8> local_array, bool use_local, bool is_light = false)
 {
 	uint layer = 0;
 
@@ -188,7 +188,14 @@
 			if(local_array[i])
 				layer |= (1 << (20+i));
 	}
-	
+
+	/* we don't have spare bits for localview (normally 20-28) because
+	 * PATH_RAY_LAYER_SHIFT uses 20-32. So - check if we have localview and if
+	 * so, shift local view bits down to 1-8, since this is done for the view
+	 * port only - it should be OK and not conflict with render layers. */
+	if(use_local)
+		layer >>= 20;
+
 	return layer;
 }
 


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list