[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58536] tags/blender-2.68a-release/blender : svn merge ^/trunk/ blender -c58374 -c58406 -c58422 -c58427 -c58436 -c58440 -c58441 -c58463 -c58504 -c58509 -c58512 -c58513 -c58514 -c58516 -c58520 -c58532 -c58534
Campbell Barton
ideasman42 at gmail.com
Tue Jul 23 10:28:28 CEST 2013
Revision: 58536
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58536
Author: campbellbarton
Date: 2013-07-23 08:28:28 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c58374 -c58406 -c58422 -c58427 -c58436 -c58440 -c58441 -c58463 -c58504 -c58509 -c58512 -c58513 -c58514 -c58516 -c58520 -c58532 -c58534
Modified Paths:
--------------
tags/blender-2.68a-release/blender/intern/cycles/blender/blender_sync.cpp
tags/blender-2.68a-release/blender/intern/cycles/render/session.cpp
tags/blender-2.68a-release/blender/release/datafiles/splash.png
tags/blender-2.68a-release/blender/source/blender/blenkernel/BKE_blender.h
tags/blender-2.68a-release/blender/source/blender/blenkernel/intern/cloth.c
tags/blender-2.68a-release/blender/source/blender/blenkernel/intern/sequencer.c
tags/blender-2.68a-release/blender/source/blender/compositor/intern/COM_SocketReader.h
tags/blender-2.68a-release/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MathBaseOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixAddOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixBurnOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixColorOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixDivideOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixHueOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixLightenOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixScreenOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MixValueOperation.cpp
tags/blender-2.68a-release/blender/source/blender/editors/mesh/mesh_data.c
tags/blender-2.68a-release/blender/source/blender/editors/render/render_opengl.c
tags/blender-2.68a-release/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
tags/blender-2.68a-release/blender/source/blender/editors/sculpt_paint/sculpt.c
tags/blender-2.68a-release/blender/source/blender/gpu/intern/gpu_material.c
tags/blender-2.68a-release/blender/source/blender/modifiers/intern/MOD_ocean.c
tags/blender-2.68a-release/blender/source/gameengine/Expressions/FloatValue.cpp
tags/blender-2.68a-release/blender/source/gameengine/Expressions/IntValue.cpp
tags/blender-2.68a-release/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
tags/blender-2.68a-release/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
tags/blender-2.68a-release/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
Property Changed:
----------------
tags/blender-2.68a-release/blender/
Property changes on: tags/blender-2.68a-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,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:58341-58364
+ /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,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:58341-58364,58374,58406,58422,58427,58436,58440-58441,58463,58504,58509,58512-58514,58516,58520,58532,58534
Modified: tags/blender-2.68a-release/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- tags/blender-2.68a-release/blender/intern/cycles/blender/blender_sync.cpp 2013-07-23 08:15:46 UTC (rev 58535)
+++ tags/blender-2.68a-release/blender/intern/cycles/blender/blender_sync.cpp 2013-07-23 08:28:28 UTC (rev 58536)
@@ -392,7 +392,7 @@
else {
params.samples = get_int(cscene, "preview_aa_samples");
if(params.samples == 0)
- params.samples = INT_MAX;
+ params.samples = 65536;
}
}
else {
@@ -402,7 +402,7 @@
else {
params.samples = get_int(cscene, "preview_samples");
if(params.samples == 0)
- params.samples = INT_MAX;
+ params.samples = 65536;
}
}
Modified: tags/blender-2.68a-release/blender/intern/cycles/render/session.cpp
===================================================================
--- tags/blender-2.68a-release/blender/intern/cycles/render/session.cpp 2013-07-23 08:15:46 UTC (rev 58535)
+++ tags/blender-2.68a-release/blender/intern/cycles/render/session.cpp 2013-07-23 08:28:28 UTC (rev 58536)
@@ -786,7 +786,7 @@
substatus += string_printf(", Sample %d/%d", sample, num_samples);
}
}
- else if(tile_manager.num_samples == INT_MAX)
+ else if(tile_manager.num_samples == 65536)
substatus = string_printf("Path Tracing Sample %d", sample+1);
else
substatus = string_printf("Path Tracing Sample %d/%d", sample+1, tile_manager.num_samples);
Modified: tags/blender-2.68a-release/blender/release/datafiles/splash.png
===================================================================
(Binary files differ)
Modified: tags/blender-2.68a-release/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- tags/blender-2.68a-release/blender/source/blender/blenkernel/BKE_blender.h 2013-07-23 08:15:46 UTC (rev 58535)
+++ tags/blender-2.68a-release/blender/source/blender/blenkernel/BKE_blender.h 2013-07-23 08:28:28 UTC (rev 58536)
@@ -50,7 +50,7 @@
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR
+#define BLENDER_VERSION_CHAR a
/* alpha/beta/rc/release, docs use this */
#define BLENDER_VERSION_CYCLE release
Modified: tags/blender-2.68a-release/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- tags/blender-2.68a-release/blender/source/blender/blenkernel/intern/cloth.c 2013-07-23 08:15:46 UTC (rev 58535)
+++ tags/blender-2.68a-release/blender/source/blender/blenkernel/intern/cloth.c 2013-07-23 08:28:28 UTC (rev 58536)
@@ -476,7 +476,6 @@
BKE_ptcache_validate(cache, 0);
cache->last_exact= 0;
cache->flag &= ~PTCACHE_REDO_NEEDED;
- return;
}
// unused in the moment, calculated separately in implicit.c
Modified: tags/blender-2.68a-release/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- tags/blender-2.68a-release/blender/source/blender/blenkernel/intern/sequencer.c 2013-07-23 08:15:46 UTC (rev 58535)
+++ tags/blender-2.68a-release/blender/source/blender/blenkernel/intern/sequencer.c 2013-07-23 08:28:28 UTC (rev 58536)
@@ -179,8 +179,10 @@
if (seq->strip)
seq_free_strip(seq->strip);
- if (seq->anim)
+ if (seq->anim) {
IMB_free_anim(seq->anim);
+ seq->anim = NULL;
+ }
if (seq->type & SEQ_TYPE_EFFECT) {
struct SeqEffectHandle sh = BKE_sequence_get_effect(seq);
Modified: tags/blender-2.68a-release/blender/source/blender/compositor/intern/COM_SocketReader.h
===================================================================
--- tags/blender-2.68a-release/blender/source/blender/compositor/intern/COM_SocketReader.h 2013-07-23 08:15:46 UTC (rev 58535)
+++ tags/blender-2.68a-release/blender/source/blender/compositor/intern/COM_SocketReader.h 2013-07-23 08:28:28 UTC (rev 58536)
@@ -91,13 +91,13 @@
virtual void executePixel(float output[4], float x, float y, float dx, float dy, PixelSampler sampler) {}
public:
- inline void read(float *result, float x, float y, PixelSampler sampler) {
+ inline void read(float result[4], float x, float y, PixelSampler sampler) {
executePixel(result, x, y, sampler);
}
- inline void read(float *result, int x, int y, void *chunkData) {
+ inline void read(float result[4], int x, int y, void *chunkData) {
executePixel(result, x, y, chunkData);
}
- inline void read(float *result, float x, float y, float dx, float dy, PixelSampler sampler) {
+ inline void read(float result[4], float x, float y, float dx, float dy, PixelSampler sampler) {
executePixel(result, x, y, dx, dy, sampler);
}
Modified: tags/blender-2.68a-release/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- tags/blender-2.68a-release/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp 2013-07-23 08:15:46 UTC (rev 58535)
+++ tags/blender-2.68a-release/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp 2013-07-23 08:28:28 UTC (rev 58536)
@@ -81,6 +81,7 @@
void **g_highlightedNodes;
void **g_highlightedNodesRead;
+#if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
#define HIGHLIGHT(wp) \
{ \
ExecutionGroup *group = wp->getExecutionGroup(); \
@@ -103,6 +104,7 @@
} \
} \
}
+#endif /* COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE */
void COM_startReadHighlights()
{
Modified: tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
===================================================================
--- tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp 2013-07-23 08:15:46 UTC (rev 58535)
+++ tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp 2013-07-23 08:28:28 UTC (rev 58536)
@@ -37,7 +37,7 @@
void ConvertColorToBWOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)
{
float inputColor[4];
- this->m_inputOperation->read(&inputColor[0], x, y, sampler);
+ this->m_inputOperation->read(inputColor, x, y, sampler);
output[0] = rgb_to_bw(inputColor);
}
Modified: tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
===================================================================
--- tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp 2013-07-23 08:15:46 UTC (rev 58535)
+++ tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp 2013-07-23 08:28:28 UTC (rev 58536)
@@ -37,7 +37,7 @@
void ConvertColorToValueProg::executePixel(float output[4], float x, float y, PixelSampler sampler)
{
float inputColor[4];
- this->m_inputOperation->read(&inputColor[0], x, y, sampler);
+ this->m_inputOperation->read(inputColor, x, y, sampler);
output[0] = (inputColor[0] + inputColor[1] + inputColor[2]) / 3.0f;
}
Modified: tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MathBaseOperation.cpp
===================================================================
--- tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MathBaseOperation.cpp 2013-07-23 08:15:46 UTC (rev 58535)
+++ tags/blender-2.68a-release/blender/source/blender/compositor/operations/COM_MathBaseOperation.cpp 2013-07-23 08:28:28 UTC (rev 58536)
@@ -77,8 +77,8 @@
float inputValue1[4];
float inputValue2[4];
- this->m_inputValue1Operation->read(&inputValue1[0], x, y, sampler);
- this->m_inputValue2Operation->read(&inputValue2[0], x, y, sampler);
+ this->m_inputValue1Operation->read(inputValue1, x, y, sampler);
+ this->m_inputValue2Operation->read(inputValue2, x, y, sampler);
output[0] = inputValue1[0] + inputValue2[0];
@@ -90,8 +90,8 @@
float inputValue1[4];
float inputValue2[4];
- this->m_inputValue1Operation->read(&inputValue1[0], x, y, sampler);
- this->m_inputValue2Operation->read(&inputValue2[0], x, y, sampler);
+ this->m_inputValue1Operation->read(inputValue1, x, y, sampler);
+ this->m_inputValue2Operation->read(inputValue2, x, y, sampler);
output[0] = inputValue1[0] - inputValue2[0];
@@ -103,8 +103,8 @@
float inputValue1[4];
float inputValue2[4];
- this->m_inputValue1Operation->read(&inputValue1[0], x, y, sampler);
- this->m_inputValue2Operation->read(&inputValue2[0], x, y, sampler);
+ this->m_inputValue1Operation->read(inputValue1, x, y, sampler);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list