[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51189] tags/blender-2.64a-release/blender : Merging rendering fixes from trunk into 2.64a tag
Sergey Sharybin
sergey.vfx at gmail.com
Mon Oct 8 16:11:04 CEST 2012
Revision: 51189
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51189
Author: nazgul
Date: 2012-10-08 14:11:04 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Merging rendering fixes from trunk into 2.64a tag
This includes revisions: 51132, 51079, 51181, 51081, 51080
Modified Paths:
--------------
tags/blender-2.64a-release/blender/intern/cycles/render/light.cpp
tags/blender-2.64a-release/blender/source/blender/editors/space_view3d/drawobject.c
tags/blender-2.64a-release/blender/source/blender/makesrna/intern/rna_object_api.c
tags/blender-2.64a-release/blender/source/blender/makesrna/intern/rna_render.c
tags/blender-2.64a-release/blender/source/blender/windowmanager/intern/wm_files.c
Property Changed:
----------------
tags/blender-2.64a-release/blender/
tags/blender-2.64a-release/blender/source/blender/editors/interface/interface.c
tags/blender-2.64a-release/blender/source/blender/editors/space_outliner/
Property changes on: tags/blender-2.64a-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
/trunk/blender:51017-51025,51041-51043,51056,51060,51076,51108,51158,51168,51184,51186
+ /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:51017-51025,51041-51043,51056,51060,51076,51079-51081,51108,51132,51158,51168,51181,51184,51186
Modified: tags/blender-2.64a-release/blender/intern/cycles/render/light.cpp
===================================================================
--- tags/blender-2.64a-release/blender/intern/cycles/render/light.cpp 2012-10-08 14:07:03 UTC (rev 51188)
+++ tags/blender-2.64a-release/blender/intern/cycles/render/light.cpp 2012-10-08 14:11:04 UTC (rev 51189)
@@ -68,20 +68,15 @@
main_task.shader_w = width*height;
/* disabled splitting for now, there's an issue with multi-GPU mem_copy_from */
-#if 0
list<DeviceTask> split_tasks;
main_task.split_max_size(split_tasks, 128*128);
foreach(DeviceTask& task, split_tasks) {
device->task_add(task);
device->task_wait();
+ device->mem_copy_from(d_output, task.shader_x, 1, task.shader_w, sizeof(float4));
}
-#else
- device->task_add(main_task);
- device->task_wait();
-#endif
- device->mem_copy_from(d_output, 0, 1, d_output.size(), sizeof(float4));
device->mem_free(d_input);
device->mem_free(d_output);
Property changes on: tags/blender-2.64a-release/blender/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:51017-51025,51041-51043,51056,51060,51076,51108,51158,51168,51184,51186
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:51017-51025,51041-51043,51056,51060,51076,51079-51081,51108,51132,51158,51168,51181,51184,51186
Property changes on: tags/blender-2.64a-release/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner: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/source/blender/editors/space_outliner:51017-51025,51041-51043,51056,51060,51076,51108,51158,51168,51184,51186
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner: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/source/blender/editors/space_outliner:51017-51025,51041-51043,51056,51060,51076,51079-51081,51108,51132,51158,51168,51181,51184,51186
Modified: tags/blender-2.64a-release/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/editors/space_view3d/drawobject.c 2012-10-08 14:07:03 UTC (rev 51188)
+++ tags/blender-2.64a-release/blender/source/blender/editors/space_view3d/drawobject.c 2012-10-08 14:11:04 UTC (rev 51189)
@@ -3678,7 +3678,7 @@
}
}
- if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0) {
+ if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0 && (v3d->flag2 & V3D_RENDER_SHADOW) == 0) {
/* GPU_begin_object_materials checked if this is needed */
if (do_alpha_after) {
if (ob->dtx & OB_DRAWXRAY) {
@@ -6587,7 +6587,7 @@
return;
/* xray delay? */
- if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0) {
+ if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0 && (v3d->flag2 & V3D_RENDER_SHADOW) == 0) {
/* don't do xray in particle mode, need the z-buffer */
if (!(ob->mode & OB_MODE_PARTICLE_EDIT)) {
/* xray and transp are set when it is drawing the 2nd/3rd pass */
Modified: tags/blender-2.64a-release/blender/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/makesrna/intern/rna_object_api.c 2012-10-08 14:07:03 UTC (rev 51188)
+++ tags/blender-2.64a-release/blender/source/blender/makesrna/intern/rna_object_api.c 2012-10-08 14:11:04 UTC (rev 51189)
@@ -177,6 +177,8 @@
return NULL; /* only do basis metaball */
tmpmesh = BKE_mesh_add("Mesh");
+ /* BKE_mesh_add gives us a user count we don't need */
+ tmpmesh->id.us--;
if (render) {
ListBase disp = {NULL, NULL};
@@ -186,6 +188,7 @@
}
else
BKE_mesh_from_metaball(&ob->disp, tmpmesh);
+
break;
}
@@ -214,6 +217,9 @@
dm->release(dm);
}
+ /* BKE_mesh_add/copy gives us a user count we don't need */
+ tmpmesh->id.us--;
+
break;
default:
BKE_report(reports, RPT_ERROR, "Object does not have geometry data");
@@ -283,9 +289,6 @@
/* cycles and exporters rely on this still */
BKE_mesh_tessface_ensure(tmpmesh);
- /* we don't assign it to anything */
- tmpmesh->id.us--;
-
/* make sure materials get updated in objects */
test_object_materials(&tmpmesh->id);
Modified: tags/blender-2.64a-release/blender/source/blender/makesrna/intern/rna_render.c
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/makesrna/intern/rna_render.c 2012-10-08 14:07:03 UTC (rev 51188)
+++ tags/blender-2.64a-release/blender/source/blender/makesrna/intern/rna_render.c 2012-10-08 14:11:04 UTC (rev 51189)
@@ -329,7 +329,6 @@
prop = RNA_def_pointer(func, "result", "RenderResult", "Result", "");
RNA_def_property_flag(prop, PROP_REQUIRED);
prop = RNA_def_boolean(func, "cancel", 0, "Cancel", "Don't merge back results");
- RNA_def_property_flag(prop, PROP_REQUIRED);
func = RNA_def_function(srna, "test_break", "RE_engine_test_break");
prop = RNA_def_boolean(func, "do_break", 0, "Break", "");
Modified: tags/blender-2.64a-release/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/windowmanager/intern/wm_files.c 2012-10-08 14:07:03 UTC (rev 51188)
+++ tags/blender-2.64a-release/blender/source/blender/windowmanager/intern/wm_files.c 2012-10-08 14:11:04 UTC (rev 51189)
@@ -56,6 +56,7 @@
#include "BLI_blenlib.h"
#include "BLI_linklist.h"
#include "BLI_utildefines.h"
+#include "BLI_threads.h"
#include "BLI_callbacks.h"
#include "BLF_translation.h"
@@ -794,7 +795,7 @@
/* blend file thumbnail */
/* save before exit_editmode, otherwise derivedmeshes for shared data corrupt #27765) */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list