[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48130] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48119:48129
Campbell Barton
ideasman42 at gmail.com
Wed Jun 20 19:12:21 CEST 2012
Revision: 48130
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48130
Author: campbellbarton
Date: 2012-06-20 17:12:20 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48119:48129
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48119
Modified Paths:
--------------
branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/main.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
branches/soc-2011-tomato/intern/cycles/render/film.cpp
branches/soc-2011-tomato/intern/cycles/render/film.h
branches/soc-2011-tomato/intern/raskter/raskter.c
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/boids.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/collada/MaterialExporter.cpp
branches/soc-2011-tomato/source/blender/collada/SkinInfo.cpp
branches/soc-2011-tomato/source/blender/collada/TransformReader.cpp
branches/soc-2011-tomato/source/blender/collada/collada_internal.cpp
branches/soc-2011-tomato/source/blender/collada/collada_utils.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2011-tomato/source/blender/editors/include/ED_sequencer.h
branches/soc-2011-tomato/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/imbuf/intern/jp2.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonController.cpp
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-48119
+ /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-48129
Modified: branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
===================================================================
--- branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp 2012-06-20 17:10:40 UTC (rev 48129)
+++ branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp 2012-06-20 17:12:20 UTC (rev 48130)
@@ -205,16 +205,16 @@
void
BSP_GhostTestApp3D::
UpdateFrame(
-){
-if (m_window) {
+) {
+ if (m_window) {
- GHOST_Rect v_rect;
- m_window->getClientBounds(v_rect);
+ GHOST_Rect v_rect;
+ m_window->getClientBounds(v_rect);
- glViewport(0,0,v_rect.getWidth(),v_rect.getHeight());
+ glViewport(0,0,v_rect.getWidth(),v_rect.getHeight());
+ }
}
-}
MT_Vector3
Modified: branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/main.cpp
===================================================================
--- branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/main.cpp 2012-06-20 17:10:40 UTC (rev 48129)
+++ branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/main.cpp 2012-06-20 17:12:20 UTC (rev 48130)
@@ -93,8 +93,8 @@
#endif
-int main() {
-
+int main()
+{
MT_Vector3 min,max;
MT_Vector3 min2,max2;
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp 2012-06-20 17:10:40 UTC (rev 48129)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp 2012-06-20 17:12:20 UTC (rev 48130)
@@ -218,7 +218,7 @@
}
buffer_params.passes = passes;
- scene->film->passes = passes;
+ scene->film->tag_passes_update(scene, passes);
scene->film->tag_update(scene);
scene->integrator->tag_update(scene);
Modified: branches/soc-2011-tomato/intern/cycles/render/film.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/film.cpp 2012-06-20 17:10:40 UTC (rev 48129)
+++ branches/soc-2011-tomato/intern/cycles/render/film.cpp 2012-06-20 17:12:20 UTC (rev 48130)
@@ -20,6 +20,7 @@
#include "device.h"
#include "film.h"
#include "integrator.h"
+#include "mesh.h"
#include "scene.h"
#include "util_algorithm.h"
@@ -296,6 +297,16 @@
&& Pass::equals(passes, film.passes));
}
+void Film::tag_passes_update(Scene *scene, const vector<Pass>& passes_)
+{
+ if(Pass::contains(passes, PASS_UV) != Pass::contains(passes_, PASS_UV))
+ scene->mesh_manager->tag_update(scene);
+ else if(Pass::contains(passes, PASS_MOTION) != Pass::contains(passes_, PASS_MOTION))
+ scene->mesh_manager->tag_update(scene);
+
+ passes = passes_;
+}
+
void Film::tag_update(Scene *scene)
{
need_update = true;
Modified: branches/soc-2011-tomato/intern/cycles/render/film.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/film.h 2012-06-20 17:10:40 UTC (rev 48129)
+++ branches/soc-2011-tomato/intern/cycles/render/film.h 2012-06-20 17:12:20 UTC (rev 48130)
@@ -56,6 +56,7 @@
void device_free(Device *device, DeviceScene *dscene);
bool modified(const Film& film);
+ void tag_passes_update(Scene *scene, const vector<Pass>& passes_);
void tag_update(Scene *scene);
};
Modified: branches/soc-2011-tomato/intern/raskter/raskter.c
===================================================================
--- branches/soc-2011-tomato/intern/raskter/raskter.c 2012-06-20 17:10:40 UTC (rev 48129)
+++ branches/soc-2011-tomato/intern/raskter/raskter.c 2012-06-20 17:12:20 UTC (rev 48130)
@@ -67,7 +67,8 @@
* just the poly. Since the DEM code could end up being coupled with this, we'll keep it separate
* for now.
*/
-static void preprocess_all_edges(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, struct e_status *open_edge) {
+static void preprocess_all_edges(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, struct e_status *open_edge)
+{
int i;
int xbeg;
int ybeg;
@@ -165,7 +166,8 @@
* for speed, but waiting on final design choices for curve-data before eliminating data the DEM code will need
* if it ends up being coupled with this function.
*/
-static int rast_scan_fill(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, float intensity) {
+static int rast_scan_fill(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, float intensity)
+{
int x_curr; /* current pixel position in X */
int y_curr; /* current scan line being drawn */
int yp; /* y-pixel's position in frame buffer */
@@ -757,18 +759,21 @@
return i; /* Return the value returned by the rasterizer. */
}
-int get_range_expanded_pixel_coord(float normalized_value, int max_value) {
+int get_range_expanded_pixel_coord(float normalized_value, int max_value)
+{
return (int)((normalized_value * (float)(max_value)) + 0.5f);
}
-float get_pixel_intensity(float *buf, int buf_x, int buf_y, int pos_x, int pos_y) {
+float get_pixel_intensity(float *buf, int buf_x, int buf_y, int pos_x, int pos_y)
+{
if(pos_x < 0 || pos_x >= buf_x || pos_y < 0 || pos_y >= buf_y) {
return 0.0f;
}
return buf[(pos_y * buf_y) + buf_x];
}
-float get_pixel_intensity_bilinear(float *buf, int buf_x, int buf_y, float u, float v) {
+float get_pixel_intensity_bilinear(float *buf, int buf_x, int buf_y, float u, float v)
+{
int a;
int b;
int a_plus_1;
@@ -794,14 +799,16 @@
}
-void set_pixel_intensity(float *buf, int buf_x, int buf_y, int pos_x, int pos_y, float intensity) {
+void set_pixel_intensity(float *buf, int buf_x, int buf_y, int pos_x, int pos_y, float intensity)
+{
if(pos_x < 0 || pos_x >= buf_x || pos_y < 0 || pos_y >= buf_y) {
return;
}
buf[(pos_y * buf_y) + buf_x] = intensity;
}
#define __PLX__FAKE_AA__
-int PLX_antialias_buffer(float *buf, int buf_x, int buf_y) {
+int PLX_antialias_buffer(float *buf, int buf_x, int buf_y)
+{
#ifdef __PLX__FAKE_AA__
#ifdef __PLX_GREY_AA__
int i=0;
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py 2012-06-20 17:10:40 UTC (rev 48129)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py 2012-06-20 17:12:20 UTC (rev 48130)
@@ -256,7 +256,7 @@
layout.operator("sequencer.rebuild_proxy")
layout.separator()
- layout.operator("sequencer.duplicate")
+ layout.operator("sequencer.duplicate_move")
layout.operator("sequencer.delete")
strip = act_strip(context)
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/boids.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/boids.c 2012-06-20 17:10:40 UTC (rev 48129)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/boids.c 2012-06-20 17:12:20 UTC (rev 48130)
@@ -920,7 +920,8 @@
return state;
}
-//static int boid_condition_is_true(BoidCondition *cond) {
+//static int boid_condition_is_true(BoidCondition *cond)
+//{
// /* TODO */
// return 0;
//}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c 2012-06-20 17:10:40 UTC (rev 48129)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c 2012-06-20 17:12:20 UTC (rev 48130)
@@ -3101,7 +3101,8 @@
return ob_arm;
}
-static int obrel_is_recursive_child(Object *ob, Object *child) {
+static int obrel_is_recursive_child(Object *ob, Object *child)
+{
Object *par;
for (par = child->parent; par; par = par->parent) {
if (par == ob) {
Modified: branches/soc-2011-tomato/source/blender/collada/MaterialExporter.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/collada/MaterialExporter.cpp 2012-06-20 17:10:40 UTC (rev 48129)
+++ branches/soc-2011-tomato/source/blender/collada/MaterialExporter.cpp 2012-06-20 17:12:20 UTC (rev 48130)
@@ -31,7 +31,9 @@
#include "COLLADABUUtils.h"
#include "collada_internal.h"
-MaterialsExporter::MaterialsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryMaterials(sw), export_settings(export_settings) {
+MaterialsExporter::MaterialsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryMaterials(sw), export_settings(export_settings)
+{
+ /* pass */
}
void MaterialsExporter::exportMaterials(Scene *sce)
Modified: branches/soc-2011-tomato/source/blender/collada/SkinInfo.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/collada/SkinInfo.cpp 2012-06-20 17:10:40 UTC (rev 48129)
+++ branches/soc-2011-tomato/source/blender/collada/SkinInfo.cpp 2012-06-20 17:12:20 UTC (rev 48130)
@@ -57,7 +57,9 @@
// This is used to store data passed in write_controller_data.
// Arrays from COLLADAFW::SkinControllerData lose ownership, so do this class members
// so that arrays don't get freed until we free them explicitly.
-SkinInfo::SkinInfo() {
+SkinInfo::SkinInfo()
+{
+ /* pass */
}
SkinInfo::SkinInfo(const SkinInfo& skin) : weights(skin.weights),
Modified: branches/soc-2011-tomato/source/blender/collada/TransformReader.cpp
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list