[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57175] branches/multiview: multiview : merging from github branch (first commit)

Dalai Felinto dfelinto at gmail.com
Sat Jun 1 11:12:24 CEST 2013


Revision: 57175
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57175
Author:   dfelinto
Date:     2013-06-01 09:12:24 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
multiview : merging from github branch (first commit)
github: 2d08cb0db35abb0c234e3027c5d98940e7050134

note: this is trunk/svn revision: 57174
(note2: this is the first commit from multiview branch + a merge from svn, so there is more here than multiview only)

Modified Paths:
--------------
    branches/multiview/build_files/build_environment/install_deps.sh
    branches/multiview/intern/cycles/blender/addon/ui.py
    branches/multiview/intern/cycles/blender/blender_session.cpp
    branches/multiview/intern/cycles/blender/blender_session.h
    branches/multiview/intern/cycles/device/device_opencl.cpp
    branches/multiview/intern/cycles/util/util_opencl.cpp
    branches/multiview/intern/cycles/util/util_task.cpp
    branches/multiview/intern/cycles/util/util_time.cpp
    branches/multiview/intern/guardedalloc/intern/mallocn.c
    branches/multiview/release/datafiles/blender_icons.svg
    branches/multiview/release/datafiles/blender_icons16.png
    branches/multiview/release/datafiles/blender_icons32.png
    branches/multiview/release/scripts/modules/bpy_types.py
    branches/multiview/release/scripts/presets/keyconfig/maya.py
    branches/multiview/release/scripts/startup/bl_operators/view3d.py
    branches/multiview/release/scripts/startup/bl_ui/__init__.py
    branches/multiview/release/scripts/startup/bl_ui/space_userpref.py
    branches/multiview/release/scripts/startup/bl_ui/space_view3d.py
    branches/multiview/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/multiview/release/scripts/startup/nodeitems_builtins.py
    branches/multiview/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/multiview/source/blender/blenkernel/BKE_image.h
    branches/multiview/source/blender/blenkernel/BKE_node.h
    branches/multiview/source/blender/blenkernel/BKE_scene.h
    branches/multiview/source/blender/blenkernel/intern/DerivedMesh.c
    branches/multiview/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/multiview/source/blender/blenkernel/intern/customdata.c
    branches/multiview/source/blender/blenkernel/intern/dynamicpaint.c
    branches/multiview/source/blender/blenkernel/intern/editderivedmesh.c
    branches/multiview/source/blender/blenkernel/intern/image.c
    branches/multiview/source/blender/blenkernel/intern/mesh.c
    branches/multiview/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/multiview/source/blender/blenkernel/intern/node.c
    branches/multiview/source/blender/blenkernel/intern/ocean.c
    branches/multiview/source/blender/blenkernel/intern/pbvh.c
    branches/multiview/source/blender/blenkernel/intern/scene.c
    branches/multiview/source/blender/blenkernel/intern/sequencer.c
    branches/multiview/source/blender/blenkernel/intern/smoke.c
    branches/multiview/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/multiview/source/blender/blenkernel/intern/tracking.c
    branches/multiview/source/blender/blenkernel/intern/unit.c
    branches/multiview/source/blender/blenlib/BLI_path_util.h
    branches/multiview/source/blender/blenlib/intern/listbase.c
    branches/multiview/source/blender/blenlib/intern/path_util.c
    branches/multiview/source/blender/blenloader/intern/readfile.c
    branches/multiview/source/blender/blenloader/intern/writefile.c
    branches/multiview/source/blender/bmesh/intern/bmesh_edgeloop.c
    branches/multiview/source/blender/bmesh/intern/bmesh_edgeloop.h
    branches/multiview/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/multiview/source/blender/bmesh/operators/bmo_bridge.c
    branches/multiview/source/blender/bmesh/operators/bmo_edgenet.c
    branches/multiview/source/blender/bmesh/operators/bmo_subdivide_edgering.c
    branches/multiview/source/blender/compositor/CMakeLists.txt
    branches/multiview/source/blender/compositor/COM_compositor.h
    branches/multiview/source/blender/compositor/intern/COM_CompositorContext.h
    branches/multiview/source/blender/compositor/intern/COM_Converter.cpp
    branches/multiview/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/multiview/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/multiview/source/blender/compositor/intern/COM_Node.cpp
    branches/multiview/source/blender/compositor/intern/COM_Node.h
    branches/multiview/source/blender/compositor/intern/COM_compositor.cpp
    branches/multiview/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/multiview/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/multiview/source/blender/compositor/nodes/COM_ImageNode.h
    branches/multiview/source/blender/compositor/nodes/COM_OutputFileNode.cpp
    branches/multiview/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    branches/multiview/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/multiview/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/multiview/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/multiview/source/blender/compositor/operations/COM_OutputFileOperation.h
    branches/multiview/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
    branches/multiview/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
    branches/multiview/source/blender/editors/include/ED_screen.h
    branches/multiview/source/blender/editors/include/UI_icons.h
    branches/multiview/source/blender/editors/include/UI_interface.h
    branches/multiview/source/blender/editors/interface/interface.c
    branches/multiview/source/blender/editors/interface/interface_layout.c
    branches/multiview/source/blender/editors/interface/interface_ops.c
    branches/multiview/source/blender/editors/interface/interface_regions.c
    branches/multiview/source/blender/editors/mesh/editmesh_knife.c
    branches/multiview/source/blender/editors/render/render_intern.h
    branches/multiview/source/blender/editors/render/render_internal.c
    branches/multiview/source/blender/editors/render/render_opengl.c
    branches/multiview/source/blender/editors/render/render_ops.c
    branches/multiview/source/blender/editors/render/render_preview.c
    branches/multiview/source/blender/editors/render/render_shading.c
    branches/multiview/source/blender/editors/screen/area.c
    branches/multiview/source/blender/editors/screen/screen_edit.c
    branches/multiview/source/blender/editors/screen/screen_ops.c
    branches/multiview/source/blender/editors/screen/screendump.c
    branches/multiview/source/blender/editors/space_buttons/buttons_context.c
    branches/multiview/source/blender/editors/space_buttons/buttons_header.c
    branches/multiview/source/blender/editors/space_buttons/space_buttons.c
    branches/multiview/source/blender/editors/space_clip/tracking_ops.c
    branches/multiview/source/blender/editors/space_image/image_buttons.c
    branches/multiview/source/blender/editors/space_image/image_draw.c
    branches/multiview/source/blender/editors/space_image/image_ops.c
    branches/multiview/source/blender/editors/space_node/drawnode.c
    branches/multiview/source/blender/editors/space_node/node_edit.c
    branches/multiview/source/blender/editors/space_node/node_intern.h
    branches/multiview/source/blender/editors/space_node/node_ops.c
    branches/multiview/source/blender/editors/space_text/text_ops.c
    branches/multiview/source/blender/editors/space_view3d/drawobject.c
    branches/multiview/source/blender/editors/space_view3d/view3d_draw.c
    branches/multiview/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
    branches/multiview/source/blender/imbuf/IMB_imbuf_types.h
    branches/multiview/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/multiview/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/multiview/source/blender/imbuf/intern/openexr/openexr_stub.cpp
    branches/multiview/source/blender/imbuf/intern/thumbs.c
    branches/multiview/source/blender/makesdna/DNA_image_types.h
    branches/multiview/source/blender/makesdna/DNA_node_types.h
    branches/multiview/source/blender/makesdna/DNA_scene_types.h
    branches/multiview/source/blender/makesdna/DNA_screen_types.h
    branches/multiview/source/blender/makesdna/DNA_space_types.h
    branches/multiview/source/blender/makesdna/DNA_userdef_types.h
    branches/multiview/source/blender/makesdna/DNA_view3d_types.h
    branches/multiview/source/blender/makesdna/DNA_windowmanager_types.h
    branches/multiview/source/blender/makesrna/RNA_access.h
    branches/multiview/source/blender/makesrna/intern/rna_define.c
    branches/multiview/source/blender/makesrna/intern/rna_image.c
    branches/multiview/source/blender/makesrna/intern/rna_nodetree.c
    branches/multiview/source/blender/makesrna/intern/rna_render.c
    branches/multiview/source/blender/makesrna/intern/rna_scene.c
    branches/multiview/source/blender/makesrna/intern/rna_scene_api.c
    branches/multiview/source/blender/makesrna/intern/rna_space.c
    branches/multiview/source/blender/makesrna/intern/rna_text.c
    branches/multiview/source/blender/makesrna/intern/rna_userdef.c
    branches/multiview/source/blender/makesrna/intern/rna_wm.c
    branches/multiview/source/blender/makesrna/intern/rna_wm_api.c
    branches/multiview/source/blender/modifiers/intern/MOD_array.c
    branches/multiview/source/blender/modifiers/intern/MOD_bevel.c
    branches/multiview/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/multiview/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/multiview/source/blender/modifiers/intern/MOD_explode.c
    branches/multiview/source/blender/modifiers/intern/MOD_mask.c
    branches/multiview/source/blender/modifiers/intern/MOD_mirror.c
    branches/multiview/source/blender/modifiers/intern/MOD_ocean.c
    branches/multiview/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/multiview/source/blender/modifiers/intern/MOD_remesh.c
    branches/multiview/source/blender/modifiers/intern/MOD_screw.c
    branches/multiview/source/blender/modifiers/intern/MOD_skin.c
    branches/multiview/source/blender/modifiers/intern/MOD_solidify.c
    branches/multiview/source/blender/modifiers/intern/MOD_triangulate.c
    branches/multiview/source/blender/modifiers/intern/MOD_util.c
    branches/multiview/source/blender/nodes/CMakeLists.txt
    branches/multiview/source/blender/nodes/NOD_composite.h
    branches/multiview/source/blender/nodes/NOD_static_types.h
    branches/multiview/source/blender/nodes/composite/node_composite_tree.c
    branches/multiview/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/multiview/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/multiview/source/blender/render/extern/include/RE_engine.h
    branches/multiview/source/blender/render/extern/include/RE_pipeline.h
    branches/multiview/source/blender/render/intern/include/render_result.h
    branches/multiview/source/blender/render/intern/include/render_types.h
    branches/multiview/source/blender/render/intern/source/convertblender.c
    branches/multiview/source/blender/render/intern/source/envmap.c
    branches/multiview/source/blender/render/intern/source/external_engine.c
    branches/multiview/source/blender/render/intern/source/initrender.c
    branches/multiview/source/blender/render/intern/source/pipeline.c
    branches/multiview/source/blender/render/intern/source/render_result.c
    branches/multiview/source/blender/render/intern/source/rendercore.c
    branches/multiview/source/blender/render/intern/source/zbuf.c
    branches/multiview/source/blender/windowmanager/CMakeLists.txt
    branches/multiview/source/blender/windowmanager/intern/wm_draw.c
    branches/multiview/source/blender/windowmanager/intern/wm_operators.c
    branches/multiview/source/blender/windowmanager/intern/wm_subwindow.c
    branches/multiview/source/blender/windowmanager/intern/wm_window.c
    branches/multiview/source/blender/windowmanager/wm.h
    branches/multiview/source/blender/windowmanager/wm_draw.h
    branches/multiview/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/multiview/source/creator/creator.c

Added Paths:
-----------
    branches/multiview/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
    branches/multiview/release/scripts/startup/bl_ui/properties_render_view.py
    branches/multiview/source/blender/compositor/nodes/COM_SwitchViewNode.cpp
    branches/multiview/source/blender/compositor/nodes/COM_SwitchViewNode.h
    branches/multiview/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
    branches/multiview/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
    branches/multiview/source/blender/nodes/composite/nodes/node_composite_switchview.c
    branches/multiview/source/blender/windowmanager/intern/wm_stereo.c
    branches/multiview/source/blender/windowmanager/wm_stereo.h

Removed Paths:
-------------
    branches/multiview/extern/libmv/third_party/ldl/
    branches/multiview/extern/libmv/third_party/ssba/
    branches/multiview/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_float/

Modified: branches/multiview/build_files/build_environment/install_deps.sh
===================================================================
--- branches/multiview/build_files/build_environment/install_deps.sh	2013-06-01 08:59:52 UTC (rev 57174)
+++ branches/multiview/build_files/build_environment/install_deps.sh	2013-06-01 09:12:24 UTC (rev 57175)
@@ -3091,6 +3091,7 @@
 
   if $ALL_STATIC; then
     INFO "LLIB = ["xml2", "expat"] + LLIB"
+  fi
 
   INFO ""
   INFO "NOTE: static build with scons are very tricky to set-up, if you choose that option"

Added: branches/multiview/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
===================================================================
--- branches/multiview/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py	                        (rev 0)
+++ branches/multiview/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py	2013-06-01 09:12:24 UTC (rev 57175)
@@ -0,0 +1,14 @@
+"""
+Popup Menus
++++++++++++
+Popup menus can be useful for creating menus without having to register menu classes.
+
+Note that they will not block the scripts execution, so the caller can't wait for user input.
+"""
+
+import bpy
+
+def draw(self, context):
+    self.layout.label("Hello World")
+
+bpy.context.window_manager.popup_menu(draw, title="Greeting", icon='INFO')


Property changes on: branches/multiview/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: branches/multiview/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/multiview/intern/cycles/blender/addon/ui.py	2013-06-01 08:59:52 UTC (rev 57174)
+++ branches/multiview/intern/cycles/blender/addon/ui.py	2013-06-01 09:12:24 UTC (rev 57175)
@@ -1191,6 +1191,8 @@
         types.RENDER_PT_encoding,
         types.RENDER_PT_dimensions,
         types.RENDER_PT_stamp,
+        types.RENDERVIEW_PT_views,
+        types.RENDERVIEW_PT_view_options,
         types.SCENE_PT_scene,
         types.SCENE_PT_color_management,
         types.SCENE_PT_custom_props,

Modified: branches/multiview/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/multiview/intern/cycles/blender/blender_session.cpp	2013-06-01 08:59:52 UTC (rev 57174)
+++ branches/multiview/intern/cycles/blender/blender_session.cpp	2013-06-01 09:12:24 UTC (rev 57175)
@@ -159,9 +159,11 @@
 
 	/* sync object should be re-created */
 	sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress, session_params.device.type == DEVICE_CPU);
-	sync->sync_data(b_v3d, b_engine.camera_override());
-	sync->sync_camera(b_render, b_engine.camera_override(), width, height);
 
+	BL::Object camera = b_engine.multiview_camera();
+	sync->sync_data(b_v3d, camera);
+	sync->sync_camera(b_render, camera, width, height);
+
 	BufferParams buffer_params = BlenderSync::get_buffer_params(b_render, b_scene, PointerRNA_NULL, PointerRNA_NULL, scene->camera, width, height);
 	session->reset(buffer_params, session_params.samples);
 
@@ -240,9 +242,9 @@
 	return PASS_NONE;
 }
 
-static BL::RenderResult begin_render_result(BL::RenderEngine b_engine, int x, int y, int w, int h, const char *layername)
+static BL::RenderResult begin_render_result(BL::RenderEngine b_engine, int x, int y, int w, int h, const char *layername, int view)
 {
-	return b_engine.begin_result(x, y, w, h, layername);
+	return b_engine.begin_result(x, y, w, h, layername, view);
 }
 
 static void end_render_result(BL::RenderEngine b_engine, BL::RenderResult b_rr, bool cancel = false)
@@ -250,6 +252,11 @@
 	b_engine.end_result(b_rr, (int)cancel);
 }
 
+static void render_result_actview_set(BL::RenderEngine b_engine, int view)
+{
+	b_engine.result_actview_set(view);
+}
+
 void BlenderSession::do_write_update_render_tile(RenderTile& rtile, bool do_update_only)
 {
 	BufferParams& params = rtile.buffers->params;
@@ -259,7 +266,7 @@
 	int h = params.height;
 
 	/* get render result */
-	BL::RenderResult b_rr = begin_render_result(b_engine, x, y, w, h, b_rlay_name.c_str());
+	BL::RenderResult b_rr = begin_render_result(b_engine, x, y, w, h, b_rlay_name.c_str(), b_rview_id);
 
 	/* can happen if the intersected rectangle gives 0 width or height */
 	if (b_rr.ptr.data == NULL) {
@@ -320,69 +327,77 @@
 	/* render each layer */
 	BL::RenderSettings r = b_scene.render();
 	BL::RenderSettings::layers_iterator b_iter;
+	BL::RenderSettings::views_iterator b_iterv;
 	
 	for(r.layers.begin(b_iter); b_iter != r.layers.end(); ++b_iter) {
 		b_rlay_name = b_iter->name();
 
-		/* temporary render result to find needed passes */
-		BL::RenderResult b_rr = begin_render_result(b_engine, 0, 0, 1, 1, b_rlay_name.c_str());
-		BL::RenderResult::layers_iterator b_single_rlay;
-		b_rr.layers.begin(b_single_rlay);
+		for(r.views.begin(b_iterv), b_rview_id=0; b_iterv != r.views.end(); ++b_iterv, b_rview_id++) {
+			/* temporary render result to find needed passes */
+			BL::RenderResult b_rr = begin_render_result(b_engine, 0, 0, 1, 1, b_rlay_name.c_str(), -1);
+			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()) {
-			end_render_result(b_engine, b_rr, true);
-			continue;
-		}
+			/* layer will be missing if it was disabled in the UI */
+			if(b_single_rlay == b_rr.layers.end()) {
+				end_render_result(b_engine, b_rr, true);
+				continue;
+			}
 
-		BL::RenderLayer b_rlay = *b_single_rlay;
+			/* set the current view */
+			render_result_actview_set(b_engine, b_rview_id);
 
-		/* add passes */
-		vector<Pass> passes;
-		Pass::add(PASS_COMBINED, passes);
+			BL::RenderLayer b_rlay = *b_single_rlay;
 
-		if(session_params.device.advanced_shading) {
+			/* add passes */
+			vector<Pass> passes;
+			Pass::add(PASS_COMBINED, passes);
 
-			/* loop over passes */
-			BL::RenderLayer::passes_iterator b_pass_iter;
+			if(session_params.device.advanced_shading) {
 
-			for(b_rlay.passes.begin(b_pass_iter); b_pass_iter != b_rlay.passes.end(); ++b_pass_iter) {
-				BL::RenderPass b_pass(*b_pass_iter);
-				PassType pass_type = get_pass_type(b_pass);
+				/* loop over passes */
+				BL::RenderLayer::passes_iterator b_pass_iter;
 
-				if(pass_type == PASS_MOTION && scene->integrator->motion_blur)
-					continue;
-				if(pass_type != PASS_NONE)
-					Pass::add(pass_type, passes);
+				for(b_rlay.passes.begin(b_pass_iter); b_pass_iter != b_rlay.passes.end(); ++b_pass_iter) {
+					BL::RenderPass b_pass(*b_pass_iter);
+					PassType pass_type = get_pass_type(b_pass);
+
+					if(pass_type == PASS_MOTION && scene->integrator->motion_blur)
+						continue;
+					if(pass_type != PASS_NONE)
+						Pass::add(pass_type, passes);
+				}
 			}
-		}
 
-		/* free result without merging */
-		end_render_result(b_engine, b_rr, true);
+			/* free result without merging */
+			end_render_result(b_engine, b_rr, true);
 
-		buffer_params.passes = passes;
-		scene->film->tag_passes_update(scene, passes);
-		scene->film->tag_update(scene);
-		scene->integrator->tag_update(scene);
+			buffer_params.passes = passes;
+			scene->film->tag_passes_update(scene, passes);
+			scene->film->tag_update(scene);
+			scene->integrator->tag_update(scene);
 
-		/* update scene */
-		sync->sync_data(b_v3d, b_engine.camera_override(), b_rlay_name.c_str());
+			/* update scene */
+			BL::Object camera = b_engine.multiview_camera();
+			sync->sync_data(b_v3d, camera, b_rlay_name.c_str());
+			sync->sync_camera(b_render, camera, width, height);
 
-		/* update number of samples per layer */
-		int samples = sync->get_layer_samples();
-		bool bound_samples = sync->get_layer_bound_samples();
+			/* update number of samples per layer */
+			int samples = sync->get_layer_samples();
+			bool bound_samples = sync->get_layer_bound_samples();
 
-		if(samples != 0 && (!bound_samples || (samples < session_params.samples)))
-			session->reset(buffer_params, samples);
-		else
-			session->reset(buffer_params, session_params.samples);
+			if(samples != 0 && (!bound_samples || (samples < session_params.samples)))
+				session->reset(buffer_params, samples);
+			else
+				session->reset(buffer_params, session_params.samples);
 
-		/* render */
-		session->start();
-		session->wait();
+			/* render */
+			session->start();
+			session->wait();
 
-		if(session->progress.get_cancel())
-			break;
+			if(session->progress.get_cancel())
+				break;
+		}
 	}
 
 	/* clear callback */
@@ -431,10 +446,6 @@
 		}
 	}
 
-	/* copy combined pass */
-	if(buffers->get_pass_rect(PASS_COMBINED, exposure, rtile.sample, 4, &pixels[0]))
-		b_rlay.rect(&pixels[0]);
-
 	/* tag result as updated */
 	b_engine.update_result(b_rr);
 }
@@ -479,12 +490,13 @@
 	}
 
 	/* data and camera synchronize */
-	sync->sync_data(b_v3d, b_engine.camera_override());
+	BL::Object camera = b_engine.multiview_camera();
+	sync->sync_data(b_v3d, camera);
 
 	if(b_rv3d)
 		sync->sync_view(b_v3d, b_rv3d, width, height);
 	else
-		sync->sync_camera(b_render, b_engine.camera_override(), width, height);
+		sync->sync_camera(b_render, camera, width, height);
 
 	/* unlock */
 	session->scene->mutex.unlock();

Modified: branches/multiview/intern/cycles/blender/blender_session.h
===================================================================
--- branches/multiview/intern/cycles/blender/blender_session.h	2013-06-01 08:59:52 UTC (rev 57174)
+++ branches/multiview/intern/cycles/blender/blender_session.h	2013-06-01 09:12:24 UTC (rev 57175)
@@ -85,6 +85,7 @@
 	BL::SpaceView3D b_v3d;
 	BL::RegionView3D b_rv3d;
 	string b_rlay_name;
+	int b_rview_id;
 
 	string last_status;
 	float last_progress;

Modified: branches/multiview/intern/cycles/device/device_opencl.cpp
===================================================================
--- branches/multiview/intern/cycles/device/device_opencl.cpp	2013-06-01 08:59:52 UTC (rev 57174)
+++ branches/multiview/intern/cycles/device/device_opencl.cpp	2013-06-01 09:12:24 UTC (rev 57175)
@@ -104,12 +104,209 @@
 	if(opencl_kernel_use_debug())
 		build_options += "-D__KERNEL_OPENCL_DEBUG__ ";
 
-	if (opencl_kernel_use_advanced_shading(platform))
+	if(opencl_kernel_use_advanced_shading(platform))
 		build_options += "-D__KERNEL_OPENCL_NEED_ADVANCED_SHADING__ ";
 	
 	return build_options;
 }
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list