[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43735] branches/bmesh/blender: svn merge ^/trunk/blender -r43693:43733

Campbell Barton ideasman42 at gmail.com
Thu Jan 26 20:20:44 CET 2012


Revision: 43735
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43735
Author:   campbellbarton
Date:     2012-01-26 19:20:33 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43693:43733

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

Modified Paths:
--------------
    branches/bmesh/blender/extern/libmv/third_party/glog/src/config.h
    branches/bmesh/blender/extern/libmv/third_party/glog/src/config_linux.h
    branches/bmesh/blender/intern/cycles/blender/blender_session.cpp
    branches/bmesh/blender/intern/cycles/kernel/kernel_film.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_passes.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_path.h
    branches/bmesh/blender/intern/cycles/render/buffers.cpp
    branches/bmesh/blender/intern/cycles/util/util_progress.h
    branches/bmesh/blender/intern/ffmpeg/ffmpeg_compat.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_NDOFManager.h
    branches/bmesh/blender/release/scripts/presets/keyconfig/maya.py
    branches/bmesh/blender/release/scripts/presets/tracking_settings/blurry_footage.py
    branches/bmesh/blender/release/scripts/presets/tracking_settings/default.py
    branches/bmesh/blender/release/scripts/presets/tracking_settings/fast_motion.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_logic.py
    branches/bmesh/blender/source/blender/avi/intern/endian.c
    branches/bmesh/blender/source/blender/blenkernel/BKE_cloth.h
    branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c
    branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
    branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_matrix.c
    branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
    branches/bmesh/blender/source/blender/editors/interface/interface_widgets.c
    branches/bmesh/blender/source/blender/editors/space_clip/clip_graph_draw.c
    branches/bmesh/blender/source/blender/editors/space_clip/clip_graph_ops.c
    branches/bmesh/blender/source/blender/editors/space_clip/clip_intern.h
    branches/bmesh/blender/source/blender/editors/space_clip/space_clip.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
    branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_tracking_types.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_scene_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_tracking.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_cloth.c
    branches/bmesh/blender/source/blender/render/intern/source/pipeline.c

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/intern/cycles/kernel/kernel_accumulate.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_passes.h
    branches/bmesh/blender/release/


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-43693
   + /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-43733

Modified: branches/bmesh/blender/extern/libmv/third_party/glog/src/config.h
===================================================================
--- branches/bmesh/blender/extern/libmv/third_party/glog/src/config.h	2012-01-26 19:07:01 UTC (rev 43734)
+++ branches/bmesh/blender/extern/libmv/third_party/glog/src/config.h	2012-01-26 19:20:33 UTC (rev 43735)
@@ -2,14 +2,14 @@
 /* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Namespace for Google classes */
-#ifdef __APPLE__
+#if defined(__APPLE__)
  #include "config_mac.h"
-#elif __FreeBSD__
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  #include "config_freebsd.h"
-#elif __MINGW32__
+#elif defined(__MINGW32__)
  #include "windows/config.h"
-#elif __GNUC__
+#elif defined(__linux__)
  #include "config_linux.h"
-#elif _MSC_VER
+#elif defined(_MSC_VER)
  #include "windows/config.h"
 #endif

Modified: branches/bmesh/blender/extern/libmv/third_party/glog/src/config_linux.h
===================================================================
--- branches/bmesh/blender/extern/libmv/third_party/glog/src/config_linux.h	2012-01-26 19:07:01 UTC (rev 43734)
+++ branches/bmesh/blender/extern/libmv/third_party/glog/src/config_linux.h	2012-01-26 19:20:33 UTC (rev 43735)
@@ -133,8 +133,10 @@
 /* How to access the PC from a struct ucontext */
 #if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
   #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
+#elif defined(_M_IX86) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)
+  #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_EIP]
 #else
-  #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_EIP]
+  #undef PC_FROM_UCONTEXT
 #endif
 
 /* Define to necessary symbol if this constant uses a non-standard name on

Modified: branches/bmesh/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_session.cpp	2012-01-26 19:07:01 UTC (rev 43734)
+++ branches/bmesh/blender/intern/cycles/blender/blender_session.cpp	2012-01-26 19:20:33 UTC (rev 43735)
@@ -203,6 +203,9 @@
 		b_rlay = *b_iter;
 
 		/* add passes */
+		vector<Pass> passes;
+		Pass::add(PASS_COMBINED, passes);
+
 		if(session_params.device.type == DEVICE_CPU) { /* todo */
 			BL::RenderLayer::passes_iterator b_pass_iter;
 			
@@ -211,12 +214,13 @@
 				PassType pass_type = get_pass_type(b_pass);
 
 				if(pass_type != PASS_NONE)
-					Pass::add(pass_type, buffer_params.passes);
+					Pass::add(pass_type, passes);
 			}
 		}
 
-		scene->film->passes = buffer_params.passes;
-		scene->film->need_update = true;
+		buffer_params.passes = passes;
+		scene->film->passes = passes;
+		scene->film->tag_update(scene);
 
 		/* update session */
 		session->reset(buffer_params, session_params.samples);


Property changes on: branches/bmesh/blender/intern/cycles/kernel/kernel_accumulate.h
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: branches/bmesh/blender/intern/cycles/kernel/kernel_film.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/kernel_film.h	2012-01-26 19:07:01 UTC (rev 43734)
+++ branches/bmesh/blender/intern/cycles/kernel/kernel_film.h	2012-01-26 19:20:33 UTC (rev 43735)
@@ -59,7 +59,7 @@
 	buffer += index*kernel_data.film.pass_stride;
 
 	/* map colors */
-	float4 irradiance = *(float4*)buffer;
+	float4 irradiance = *((__global float4*)buffer);
 	float4 float_result = film_map(kg, irradiance, sample);
 	uchar4 byte_result = film_float_to_byte(float_result);
 

Modified: branches/bmesh/blender/intern/cycles/kernel/kernel_passes.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/kernel_passes.h	2012-01-26 19:07:01 UTC (rev 43734)
+++ branches/bmesh/blender/intern/cycles/kernel/kernel_passes.h	2012-01-26 19:20:33 UTC (rev 43735)
@@ -20,31 +20,22 @@
 
 __device_inline void kernel_write_pass_float(__global float *buffer, int sample, float value)
 {
-	float *buf = buffer;
+	__global float *buf = buffer;
 	*buf = (sample == 0)? value: *buf + value;
 }
 
 __device_inline void kernel_write_pass_float3(__global float *buffer, int sample, float3 value)
 {
-	float3 *buf = (float3*)buffer;
+	__global float3 *buf = (__global float3*)buffer;
 	*buf = (sample == 0)? value: *buf + value;
 }
 
 __device_inline void kernel_write_pass_float4(__global float *buffer, int sample, float4 value)
 {
-	float4 *buf = (float4*)buffer;
+	__global float4 *buf = (__global float4*)buffer;
 	*buf = (sample == 0)? value: *buf + value;
 }
 
-__device_inline void kernel_clear_passes(__global float *buffer, int sample, int pass_stride)
-{
-#ifdef __PASSES__
-	if(sample == 0 && pass_stride != 4)
-		for(int i = 4; i < pass_stride; i++)
-			buffer[i] = 0.0f;
-#endif
-}
-
 __device void kernel_write_data_passes(KernelGlobals *kg, __global float *buffer, PathRadiance *L,
 	ShaderData *sd, int sample, int path_flag, float3 throughput)
 {


Property changes on: branches/bmesh/blender/intern/cycles/kernel/kernel_passes.h
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: branches/bmesh/blender/intern/cycles/kernel/kernel_path.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/kernel_path.h	2012-01-26 19:07:01 UTC (rev 43734)
+++ branches/bmesh/blender/intern/cycles/kernel/kernel_path.h	2012-01-26 19:20:33 UTC (rev 43735)
@@ -220,7 +220,7 @@
 
 	path_radiance_init(&L, kernel_data.film.use_light_pass);
 
-#ifdef __EMISSION__
+#if defined(__EMISSION__) || defined(__BACKGROUND__)
 	float ray_pdf = 0.0f;
 #endif
 	PathState state;
@@ -239,11 +239,13 @@
 			if(kernel_data.background.transparent && (state.flag & PATH_RAY_CAMERA)) {
 				L_transparent += average(throughput);
 			}
+#ifdef __BACKGROUND__
 			else {
 				/* sample background shader */
 				float3 L_background = indirect_background(kg, &ray, state.flag, ray_pdf);
 				path_radiance_accum_background(&L, throughput, L_background, state.bounce);
 			}
+#endif
 
 			break;
 		}
@@ -377,8 +379,6 @@
 	rng_state += index;
 	buffer += index*pass_stride;
 
-	kernel_clear_passes(buffer, sample, pass_stride);
-
 	/* initialize random numbers */
 	RNG rng;
 

Modified: branches/bmesh/blender/intern/cycles/render/buffers.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/render/buffers.cpp	2012-01-26 19:07:01 UTC (rev 43734)
+++ branches/bmesh/blender/intern/cycles/render/buffers.cpp	2012-01-26 19:20:33 UTC (rev 43735)
@@ -157,11 +157,18 @@
 			assert(pass.components == components);
 
 			/* scalar */
-			for(int i = 0; i < size; i++, in += pass_stride, pixels++) {
-				float f = *in;
-
-				pixels[0] = f*scale_exposure;
+			if(type == PASS_DEPTH) {
+				for(int i = 0; i < size; i++, in += pass_stride, pixels++) {
+					float f = *in;
+					pixels[0] = (f == 0.0f)? 1e10f: f*scale_exposure;
+				}
 			}
+			else {
+				for(int i = 0; i < size; i++, in += pass_stride, pixels++) {
+					float f = *in;
+					pixels[0] = f*scale_exposure;
+				}
+			}
 		}
 		else if(components == 3) {
 			assert(pass.components == 4);

Modified: branches/bmesh/blender/intern/cycles/util/util_progress.h
===================================================================
--- branches/bmesh/blender/intern/cycles/util/util_progress.h	2012-01-26 19:07:01 UTC (rev 43734)
+++ branches/bmesh/blender/intern/cycles/util/util_progress.h	2012-01-26 19:20:33 UTC (rev 43735)
@@ -96,7 +96,7 @@
 	{
 		thread_scoped_lock lock(progress_mutex);
 
-		start_time = start_time;
+		start_time = start_time_;
 	}
 
 	void set_sample(int sample_, double sample_time_)

Modified: branches/bmesh/blender/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- branches/bmesh/blender/intern/ffmpeg/ffmpeg_compat.h	2012-01-26 19:07:01 UTC (rev 43734)
+++ branches/bmesh/blender/intern/ffmpeg/ffmpeg_compat.h	2012-01-26 19:20:33 UTC (rev 43735)
@@ -35,6 +35,7 @@
 
 #include <libavcodec/avcodec.h>
 #include <libavutil/rational.h>
+#include <libavutil/opt.h>
 
 #if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))
 #define FFMPEG_HAVE_PARSE_UTILS 1

Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_NDOFManager.cpp	2012-01-26 19:07:01 UTC (rev 43734)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_NDOFManager.cpp	2012-01-26 19:20:33 UTC (rev 43735)
@@ -77,6 +77,12 @@
 	"NDOF_BUTTON_8",
 	"NDOF_BUTTON_9",
 	"NDOF_BUTTON_10",
+	// more general-purpose buttons
+	"NDOF_BUTTON_A",
+	"NDOF_BUTTON_B",
+	"NDOF_BUTTON_C",
+	// the end
+	"NDOF_BUTTON_LAST"
 };
 #endif
 
@@ -169,7 +175,7 @@
 };
 
 /* this is the older SpacePilot (sans Pro)
- * thanks to polosson for the info in this table */
+ * thanks to polosson for info about this device */
 static const NDOF_ButtonT SpacePilot_HID_map[] = {
 	NDOF_BUTTON_1,
 	NDOF_BUTTON_2,
@@ -194,6 +200,23 @@
 	NDOF_BUTTON_NONE // the CONFIG button -- what does it do?
 };
 
+/* this is the older Spaceball 5000 USB
+ * thanks to Tehrasha Darkon for info about this device */
+static const NDOF_ButtonT Spaceball5000_HID_map[] = {
+	NDOF_BUTTON_1,
+	NDOF_BUTTON_2,
+	NDOF_BUTTON_3,
+	NDOF_BUTTON_4,
+	NDOF_BUTTON_5,
+	NDOF_BUTTON_6,
+	NDOF_BUTTON_7,

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list