[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36612] trunk/blender/source/blender/ editors/space_view3d/view3d_draw.c: recent camera border drawing glitch fix needs to be applied to the top right
Revision: 36612
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36612
Author: campbellbarton
Date: 2011-05-11 09:42:46 + (Wed, 11 May 2011)
Log Message:
---
recent camera border drawing glitch fix needs to be applied to the top right
sides too.
Modified Paths:
--
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2011-05-11 09:31:00 UTC (rev 36611)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2011-05-11 09:42:46 UTC (rev 36612)
@@ -1004,8 +1004,8 @@
* obscures the 3D camera border */
x1i= (int)(x1 - 1.0001f);
y1i= (int)(y1 - 1.0001f);
- x2i= (int)(x2 + 1.0f);
- y2i= (int)(y2 + 1.0f);
+ x2i= (int)(x2 + (1.0f-0.0001f));
+ y2i= (int)(y2 + (1.0f-0.0001f));
/* passepartout, specified in camera edit buttons */
if (ca (ca-flag CAM_SHOWPASSEPARTOUT) ca-passepartalpha
0.01f) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36613] branches/particles-2010/source/ blender: File structure changes:
Revision: 36613 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36613 Author: lukastoenne Date: 2011-05-11 12:33:34 + (Wed, 11 May 2011) Log Message: --- File structure changes: * General prefix for public node headers is now NOD. All files in the top source/blender/nodes/ folder should use this prefix. * Each node tree type gets its own directory in nodes/intern/. This way it's easier to keep the directories clean. Shared code should be in parent intern folder. * internal files use node_ prefix for shared code and node_composite_, etc. for tree code. Modified Paths: -- branches/particles-2010/source/blender/blenkernel/intern/node.c branches/particles-2010/source/blender/editors/space_node/drawnode.c branches/particles-2010/source/blender/editors/space_node/node_draw.c branches/particles-2010/source/blender/editors/space_node/node_edit.c Added Paths: --- branches/particles-2010/source/blender/nodes/ branches/particles-2010/source/blender/nodes/CMakeLists.txt branches/particles-2010/source/blender/nodes/NOD_composite.h branches/particles-2010/source/blender/nodes/NOD_shader.h branches/particles-2010/source/blender/nodes/NOD_socket.h branches/particles-2010/source/blender/nodes/NOD_texture.h branches/particles-2010/source/blender/nodes/SConscript branches/particles-2010/source/blender/nodes/intern/ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/ branches/particles-2010/source/blender/nodes/intern/PAR_nodes/ branches/particles-2010/source/blender/nodes/intern/SHD_nodes/ branches/particles-2010/source/blender/nodes/intern/TEX_nodes/ branches/particles-2010/source/blender/nodes/intern/composite/ branches/particles-2010/source/blender/nodes/intern/composite/node_composite_tree.c branches/particles-2010/source/blender/nodes/intern/composite/node_composite_util.c branches/particles-2010/source/blender/nodes/intern/composite/node_composite_util.h branches/particles-2010/source/blender/nodes/intern/composite/nodes/ branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_alphaOver.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_bilateralblur.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_blur.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_brightness.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_channelMatte.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_chromaMatte.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_colorMatte.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_colorSpill.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_colorbalance.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_common.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_composite.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_crop.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_curves.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_defocus.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_diffMatte.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_dilate.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_directionalblur.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_displace.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_distanceMatte.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_filter.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_flip.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_gamma.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_glare.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_hueSatVal.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_huecorrect.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_idMask.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_image.c branches/particles-2010/source/blender/nodes/intern/composite/nodes/node_composite_invert.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36614] branches/particles-2010/source/ blender/nodes: Moved tree type directories down one level, out of the intern folder.
Revision: 36614
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36614
Author: lukastoenne
Date: 2011-05-11 13:50:33 + (Wed, 11 May 2011)
Log Message:
---
Moved tree type directories down one level, out of the intern folder.
Fixed scons build files.
Modified Paths:
--
branches/particles-2010/source/blender/nodes/CMakeLists.txt
branches/particles-2010/source/blender/nodes/SConscript
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_common.c
branches/particles-2010/source/blender/nodes/shader/nodes/node_shader_common.c
branches/particles-2010/source/blender/nodes/texture/nodes/node_texture_common.c
Added Paths:
---
branches/particles-2010/source/blender/nodes/composite/
branches/particles-2010/source/blender/nodes/shader/
branches/particles-2010/source/blender/nodes/texture/
Removed Paths:
-
branches/particles-2010/source/blender/nodes/intern/composite/
branches/particles-2010/source/blender/nodes/intern/shader/
branches/particles-2010/source/blender/nodes/intern/texture/
Modified: branches/particles-2010/source/blender/nodes/CMakeLists.txt
===
--- branches/particles-2010/source/blender/nodes/CMakeLists.txt 2011-05-11
12:33:34 UTC (rev 36613)
+++ branches/particles-2010/source/blender/nodes/CMakeLists.txt 2011-05-11
13:50:33 UTC (rev 36614)
@@ -34,130 +34,130 @@
../makesrna
../render/extern/include
../../../intern/guardedalloc
- intern/composite
- intern/shader
- intern/texture
${GLEW_INCLUDE_PATH}
intern
+ composite
+ shader
+ texture
)
set(SRC
- intern/composite/nodes/node_composite_alphaOver.c
- intern/composite/nodes/node_composite_bilateralblur.c
- intern/composite/nodes/node_composite_blur.c
- intern/composite/nodes/node_composite_brightness.c
- intern/composite/nodes/node_composite_channelMatte.c
- intern/composite/nodes/node_composite_chromaMatte.c
- intern/composite/nodes/node_composite_colorMatte.c
- intern/composite/nodes/node_composite_colorSpill.c
- intern/composite/nodes/node_composite_colorbalance.c
- intern/composite/nodes/node_composite_common.c
- intern/composite/nodes/node_composite_composite.c
- intern/composite/nodes/node_composite_crop.c
- intern/composite/nodes/node_composite_curves.c
- intern/composite/nodes/node_composite_defocus.c
- intern/composite/nodes/node_composite_diffMatte.c
- intern/composite/nodes/node_composite_dilate.c
- intern/composite/nodes/node_composite_directionalblur.c
- intern/composite/nodes/node_composite_displace.c
- intern/composite/nodes/node_composite_distanceMatte.c
- intern/composite/nodes/node_composite_filter.c
- intern/composite/nodes/node_composite_flip.c
- intern/composite/nodes/node_composite_gamma.c
- intern/composite/nodes/node_composite_glare.c
- intern/composite/nodes/node_composite_hueSatVal.c
- intern/composite/nodes/node_composite_huecorrect.c
- intern/composite/nodes/node_composite_idMask.c
- intern/composite/nodes/node_composite_image.c
- intern/composite/nodes/node_composite_invert.c
- intern/composite/nodes/node_composite_lensdist.c
- intern/composite/nodes/node_composite_levels.c
- intern/composite/nodes/node_composite_lummaMatte.c
- intern/composite/nodes/node_composite_mapUV.c
- intern/composite/nodes/node_composite_mapValue.c
- intern/composite/nodes/node_composite_math.c
- intern/composite/nodes/node_composite_mixrgb.c
- intern/composite/nodes/node_composite_normal.c
- intern/composite/nodes/node_composite_normalize.c
- intern/composite/nodes/node_composite_outputFile.c
- intern/composite/nodes/node_composite_premulkey.c
- intern/composite/nodes/node_composite_rgb.c
- intern/composite/nodes/node_composite_rotate.c
- intern/composite/nodes/node_composite_scale.c
- intern/composite/nodes/node_composite_sepcombHSVA.c
- intern/composite/nodes/node_composite_sepcombRGBA.c
- intern/composite/nodes/node_composite_sepcombYCCA.c
- intern/composite/nodes/node_composite_sepcombYUVA.c
- intern/composite/nodes/node_composite_setalpha.c
- intern/composite/nodes/node_composite_splitViewer.c
- intern/composite/nodes/node_composite_texture.c
- intern/composite/nodes/node_composite_tonemap.c
- intern/composite/nodes/node_composite_translate.c
- intern/composite/nodes/node_composite_valToRgb.c
- intern/composite/nodes/node_composite_value.c
- intern/composite/nodes/node_composite_vecBlur.c
- intern/composite/nodes/node_composite_viewer.c
- intern/composite/nodes/node_composite_zcombine.c
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36616] branches/particles-2010/source/ blender/nodes: Fixed initialization of constant values in Value and RGB input nodes.
Revision: 36616
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36616
Author: lukastoenne
Date: 2011-05-11 14:28:56 + (Wed, 11 May 2011)
Log Message:
---
Fixed initialization of constant values in Value and RGB input nodes.
Modified Paths:
--
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_value.c
branches/particles-2010/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/particles-2010/source/blender/nodes/shader/nodes/node_shader_value.c
Modified:
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_rgb.c
===
---
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_rgb.c
2011-05-11 14:05:22 UTC (rev 36615)
+++
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_rgb.c
2011-05-11 14:28:56 UTC (rev 36616)
@@ -41,6 +41,17 @@
{ -1, 0,}
};
+static void node_composit_init_rgb(bNodeTree *UNUSED(ntree), bNode *node,
bNodeTemplate *UNUSED(ntemp))
+{
+ bNodeSocket *sock= node-outputs.first;
+ float *col= ((bNodeSocketValueRGBA*)sock-default_value)-value;
+ /* uses the default value of the output socket, must be initialized
here */
+ col[0] = 0.5f;
+ col[1] = 0.5f;
+ col[2] = 0.5f;
+ col[3] = 1.0f;
+}
+
static void node_composit_exec_rgb(void *UNUSED(data), bNode *node, bNodeStack
**UNUSED(in), bNodeStack **out)
{
bNodeSocket *sock= node-outputs.first;
@@ -55,6 +66,7 @@
node_type_base(ntype, CMP_NODE_RGB, RGB, NODE_CLASS_INPUT,
NODE_OPTIONS);
node_type_socket_templates(ntype, NULL, cmp_node_rgb_out);
+ node_type_init(ntype, node_composit_init_rgb);
node_type_size(ntype, 140, 80, 140);
node_type_exec(ntype, node_composit_exec_rgb);
Modified:
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_value.c
===
---
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_value.c
2011-05-11 14:05:22 UTC (rev 36615)
+++
branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_value.c
2011-05-11 14:28:56 UTC (rev 36616)
@@ -40,6 +40,14 @@
{ -1, 0,}
};
+static void node_composit_init_value(bNodeTree *UNUSED(ntree), bNode *node,
bNodeTemplate *UNUSED(ntemp))
+{
+ bNodeSocket *sock= node-outputs.first;
+ bNodeSocketValueFloat *dval=
(bNodeSocketValueFloat*)sock-default_value;
+ /* uses the default value of the output socket, must be initialized
here */
+ dval-value = 0.5f;
+}
+
static void node_composit_exec_value(void *UNUSED(data), bNode *node,
bNodeStack **UNUSED(in), bNodeStack **out)
{
bNodeSocket *sock= node-outputs.first;
@@ -54,6 +62,7 @@
node_type_base(ntype, CMP_NODE_VALUE, Value, NODE_CLASS_INPUT,
NODE_OPTIONS);
node_type_socket_templates(ntype, NULL, cmp_node_value_out);
+ node_type_init(ntype, node_composit_init_value);
node_type_size(ntype, 80, 40, 120);
node_type_exec(ntype, node_composit_exec_value);
Modified:
branches/particles-2010/source/blender/nodes/shader/nodes/node_shader_rgb.c
===
--- branches/particles-2010/source/blender/nodes/shader/nodes/node_shader_rgb.c
2011-05-11 14:05:22 UTC (rev 36615)
+++ branches/particles-2010/source/blender/nodes/shader/nodes/node_shader_rgb.c
2011-05-11 14:28:56 UTC (rev 36616)
@@ -40,6 +40,17 @@
{ -1, 0,}
};
+static void node_shader_init_rgb(bNodeTree *UNUSED(ntree), bNode *node,
bNodeTemplate *UNUSED(ntemp))
+{
+ bNodeSocket *sock= node-outputs.first;
+ bNodeSocketValueRGBA *dval= (bNodeSocketValueRGBA*)sock-default_value;
+ /* uses the default value of the output socket, must be initialized
here */
+ dval-value[0] = 0.5f;
+ dval-value[1] = 0.5f;
+ dval-value[2] = 0.5f;
+ dval-value[3] = 1.0f;
+}
+
static void node_shader_exec_rgb(void *UNUSED(data), bNode *node, bNodeStack
**UNUSED(in), bNodeStack **out)
{
bNodeSocket *sock= node-outputs.first;
@@ -63,6 +74,7 @@
node_type_base(ntype, SH_NODE_RGB, RGB, NODE_CLASS_INPUT,
NODE_OPTIONS);
node_type_socket_templates(ntype, NULL, sh_node_rgb_out);
+ node_type_init(ntype, node_shader_init_rgb);
node_type_size(ntype, 140, 80, 140);
node_type_exec(ntype, node_shader_exec_rgb);
node_type_gpu(ntype, gpu_shader_rgb);
Modified:
branches/particles-2010/source/blender/nodes/shader/nodes/node_shader_value.c
===
---
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36618] branches/particles-2010/source/ blender/gpu/intern/gpu_codegen.c: Removed debug print
Revision: 36618
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36618
Author: lukastoenne
Date: 2011-05-11 17:30:14 + (Wed, 11 May 2011)
Log Message:
---
Removed debug print
Modified Paths:
--
branches/particles-2010/source/blender/gpu/intern/gpu_codegen.c
Modified: branches/particles-2010/source/blender/gpu/intern/gpu_codegen.c
===
--- branches/particles-2010/source/blender/gpu/intern/gpu_codegen.c
2011-05-11 17:28:02 UTC (rev 36617)
+++ branches/particles-2010/source/blender/gpu/intern/gpu_codegen.c
2011-05-11 17:30:14 UTC (rev 36618)
@@ -390,8 +390,6 @@
{
char name[1024];
- printf(CONVERT: from=%d, to=%d\n, from, to);
-
snprintf(name, sizeof(name), %s%d, tmp, id);
if (from == to) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36619] trunk/blender/source/tools/darwin/ : Code cleanup: remove unused script.
Revision: 36619 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36619 Author: blendix Date: 2011-05-11 19:20:26 + (Wed, 11 May 2011) Log Message: --- Code cleanup: remove unused script. Removed Paths: - trunk/blender/source/tools/darwin/ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36621] trunk/blender/source/blender/ makesrna/intern/rna_smoke.c: 2.5 Smoke UI:
Revision: 36621 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36621 Author: dingto Date: 2011-05-11 20:23:55 + (Wed, 11 May 2011) Log Message: --- 2.5 Smoke UI: * More generic tooltip for strength property as it can be FFT as well. Discovered by tobkum in IRC. :) Modified Paths: -- trunk/blender/source/blender/makesrna/intern/rna_smoke.c Modified: trunk/blender/source/blender/makesrna/intern/rna_smoke.c === --- trunk/blender/source/blender/makesrna/intern/rna_smoke.c2011-05-11 19:29:23 UTC (rev 36620) +++ trunk/blender/source/blender/makesrna/intern/rna_smoke.c2011-05-11 20:23:55 UTC (rev 36621) @@ -212,7 +212,7 @@ RNA_def_property_float_sdna(prop, NULL, strength); RNA_def_property_range(prop, 0.0, 10.0); RNA_def_property_ui_range(prop, 0.0, 10.0, 1, 2); - RNA_def_property_ui_text(prop, Strength, Strength of wavelet noise); + RNA_def_property_ui_text(prop, Strength, Strength of noise); RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, rna_Smoke_reset); prop= RNA_def_property(srna, dissolve_speed, PROP_INT, PROP_NONE); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36622] branches/bmesh/blender: remove modified guardedalloc/ghost to rebranch from trunk
Revision: 36622 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36622 Author: joeedh Date: 2011-05-11 20:36:30 + (Wed, 11 May 2011) Log Message: --- remove modified guardedalloc/ghost to rebranch from trunk Modified Paths: -- branches/bmesh/blender/source/blender/blenlib/BLI_cellalloc.h Removed Paths: - branches/bmesh/blender/intern/ghost/ branches/bmesh/blender/intern/guardedalloc/ Modified: branches/bmesh/blender/source/blender/blenlib/BLI_cellalloc.h === --- branches/bmesh/blender/source/blender/blenlib/BLI_cellalloc.h 2011-05-11 20:23:55 UTC (rev 36621) +++ branches/bmesh/blender/source/blender/blenlib/BLI_cellalloc.h 2011-05-11 20:36:30 UTC (rev 36622) @@ -33,6 +33,18 @@ is found we can get rid of this code, but until then this is necassary (though, disabling it if jedmalloc is in use might be feasible). + ideas for replacement: + ok, mdisps could store a mempool in CustomDataLayer. there might be + one there already? vgroups, uh. . .not sure what to do with vgroups, + they do cause a significant performance problem. + + it's tempting to split vgroups into lots of little customdata layers, + but that would waste a LOT of memory. ugh. can we plug in jemalloc + to guardedalloc, on all platforms? that would work. + + I really hate this little library; it really should be replaced before trunk + reintegration. + - joeedh */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36623] branches/bmesh/blender/intern: add back ghost/guardedalloc from trunk
Revision: 36623 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36623 Author: joeedh Date: 2011-05-11 20:37:11 + (Wed, 11 May 2011) Log Message: --- add back ghost/guardedalloc from trunk Added Paths: --- branches/bmesh/blender/intern/ghost/ branches/bmesh/blender/intern/guardedalloc/ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36624] branches/bmesh/blender/source: remove remaining event recording code
Revision: 36624
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36624
Author: joeedh
Date: 2011-05-11 20:39:27 + (Wed, 11 May 2011)
Log Message:
---
remove remaining event recording code
Modified Paths:
--
branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
branches/bmesh/blender/source/blender/blenkernel/intern/context.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_toolbar.c
branches/bmesh/blender/source/creator/creator.c
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
===
--- branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
2011-05-11 20:37:11 UTC (rev 36623)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
2011-05-11 20:39:27 UTC (rev 36624)
@@ -267,24 +267,6 @@
int CTX_data_selected_pose_bones(const bContext *C, ListBase *list);
int CTX_data_visible_pose_bones(const bContext *C, ListBase *list);
-//stupid compiler flag isn't working
-//remember to undef this later
-#ifndef EVENT_RECORDER
-#define EVENT_RECORDER
-#endif
-
-#ifdef EVENT_RECORDER
-#include stdio.h
-
-int CTX_rec_events(bContext *C);
-FILE *CTX_rec_file(bContext *C);
-int CTX_set_events_path(bContext *C, const char *path);
-int CTX_play_events(bContext *C, char **playpath);
-int CTX_rec_events_set(bContext *C, int state);
-double CTX_rec_lasttime(bContext *C, double newtime);
-
-#endif
-
#ifdef __cplusplus
}
#endif
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/context.c
===
--- branches/bmesh/blender/source/blender/blenkernel/intern/context.c
2011-05-11 20:37:11 UTC (rev 36623)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/context.c
2011-05-11 20:39:27 UTC (rev 36624)
@@ -53,10 +53,6 @@
#include BKE_main.h
#include BKE_screen.h
-#ifdef EVENT_RECORDER
-#include ../../../../intern/ghost/GHOST_C-api.h
-#endif
-
#ifndef DISABLE_PYTHON
#ifdef WITH_PYTHON
#include BPY_extern.h
@@ -94,12 +90,6 @@
struct {
int render;
} eval;
-
-#ifdef EVENT_RECORDER
- int evtrec, evtplay;
- char evtplaypath[300];
- double evtlasttime;
-#endif
};
/* context */
@@ -120,62 +110,6 @@
return newC;
}
-#if defined(EVENT_RECORDER) !defined(BUILDING_GAMEPLAYER)
-extern GHOST_SystemHandle g_system;
-
-int CTX_rec_events(bContext *UNUSED(C))
-{
- return GHOST_RecordingEvents(g_system);
-}
-
-int CTX_rec_events_set(bContext *C, int state)
-{
- FILE *f = CTX_rec_file(C);
-
- if (GHOST_RecordingEvents(g_system) !state)
- GHOST_StopRecording(g_system);
- else if (!GHOST_RecordingEvents(g_system) state)
- GHOST_RecordEvents(g_system, f);
-
- return 1;
-}
-
-FILE *CTX_rec_file(bContext *UNUSED(C))
-{
- static FILE *f = NULL;
- if (!f)
- f = fopen(eventlog.txt, wb);
- return f;
-}
-
-int CTX_set_events_path(bContext *C, const char *path)
-{
- if (!path) {
- C-evtplaypath[0] = 0;
- } else {
- FILE *file = fopen(path, rb);
-
- if (!file)
- return 0;
-
- strcpy(C-evtplaypath, path);
- if (g_system)
- GHOST_PlaybackEvents(g_system, file);
- }
-
- return 1;
-}
-
-extern int erec_playing;
-int CTX_play_events(bContext *C, char **playpath)
-{
- if (playpath)
- *playpath = C-evtplaypath[0] ? C-evtplaypath : NULL;
-
- return GHOST_PlayingEvents(g_system);
-}
-#endif
-
void CTX_free(bContext *C)
{
MEM_freeN(C);
Modified:
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
===
--- branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
2011-05-11 20:37:11 UTC (rev 36623)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
2011-05-11 20:39:27 UTC (rev 36624)
@@ -186,9 +186,6 @@
void VIEW3D_OT_snap_cursor_to_center(struct wmOperatorType *ot);
void VIEW3D_OT_snap_cursor_to_selected(struct wmOperatorType *ot);
void VIEW3D_OT_snap_cursor_to_active(struct wmOperatorType *ot);
-#ifdef EVENT_RECORDER
-void VIEW3D_OT_evtrec(struct wmOperatorType *ot);
-#endif
/* space_view3d.c */
ARegion *view3d_has_buttons_region(ScrArea *sa);
Modified:
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
===
--- branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36625] branches/bmesh/blender/source/ blender/editors/mesh/bmesh_tools.c: compile fix
Revision: 36625 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36625 Author: joeedh Date: 2011-05-11 20:40:03 + (Wed, 11 May 2011) Log Message: --- compile fix Modified Paths: -- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c === --- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c 2011-05-11 20:39:27 UTC (rev 36624) +++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c 2011-05-11 20:40:03 UTC (rev 36625) @@ -3554,7 +3554,7 @@ BMO_Exec_Op(bm, bmop); BMO_Finish_Op(bm, bmop); - BLI_ghash_free(gh, NULL, (GHashValFreeFP)WMEM_freeN); + BLI_ghash_free(gh, NULL, (GHashValFreeFP)MEM_freeN); DAG_id_tag_update(obedit-data, OB_RECALC_DATA); WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit-data); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36626] branches/bmesh/blender/source/ blender: missing free call in rotsys_make_consistent
Revision: 36626
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36626
Author: campbellbarton
Date: 2011-05-12 00:20:35 + (Thu, 12 May 2011)
Log Message:
---
missing free call in rotsys_make_consistent
Modified Paths:
--
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c
2011-05-11 20:40:03 UTC (rev 36625)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c
2011-05-12 00:20:35 UTC (rev 36626)
@@ -325,7 +325,8 @@
} while (e != vd-e);
}
}
-
+
+ BLI_array_free(stack);
}
static void init_rotsys(BMesh *bm, EdgeData *edata, VertData *vdata)
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
===
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
2011-05-11 20:40:03 UTC (rev 36625)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
2011-05-12 00:20:35 UTC (rev 36626)
@@ -123,8 +123,7 @@
BMEditMesh *em;
if ((scene-toolsettings-automerge)
- (obedit obedit-type==OB_MESH)
- (((Mesh*)obedit-data)-mr==NULL))
+ (obedit obedit-type==OB_MESH))
{
em = ((Mesh*)obedit-data)-edit_btmesh;
if (!em)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36627] branches/bmesh/blender/source/ blender: =bmesh=
Revision: 36627 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36627 Author: joeedh Date: 2011-05-12 01:55:08 + (Thu, 12 May 2011) Log Message: --- =bmesh= 1. Removed pinning, at least until after trunk reintegration (it's a usefull feature, but incomplete). 2. Ripped out the subclassing code I originally wrote so bmesh would be more usable for modifiers (I ended up improving CDDM instead). 3. Inlined some of the macros in bmesh.h, still need to do the macros in bmesh_operator_api.h. 4. Removed the BMESH_ITER_*** macros (except for BMESH_ITER_INDEX). They were too clunkly to be worth it. Modified Paths: -- branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt branches/bmesh/blender/source/blender/bmesh/bmesh.h branches/bmesh/blender/source/blender/bmesh/bmesh_class.h branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c branches/bmesh/blender/source/blender/editors/include/ED_mesh.h branches/bmesh/blender/source/blender/editors/include/UI_resources.h branches/bmesh/blender/source/blender/editors/interface/resources.c branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c Added Paths: --- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_inline.c Modified: branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt === --- branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt 2011-05-12 00:20:35 UTC (rev 36626) +++ branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt 2011-05-12 01:55:08 UTC (rev 36627) @@ -98,6 +98,7 @@ intern/bmesh_walkers.c intern/bmesh_walkers_impl.c intern/bmesh_walkers_private.h + intern/bmesh_inline.c bmesh_error.h bmesh_queries.h bmesh.h Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h === --- branches/bmesh/blender/source/blender/bmesh/bmesh.h 2011-05-12 00:20:35 UTC (rev 36626) +++ branches/bmesh/blender/source/blender/bmesh/bmesh.h 2011-05-12 01:55:08 UTC (rev 36627) @@ -3,7 +3,7 @@ * * BMesh API. * - * $Id: BKE_bmesh.h,v 1.00 2007/01/17 17:42:01 Briggs Exp $ + * $Id: bmesh.h,v 1.00 2007/01/17 17:42:01 Briggs Exp $ * * * BEGIN GPL LICENSE BLOCK * * @@ -42,6 +42,8 @@ #include BKE_customdata.h +#include BLI_utildefines.h + /* short introduction: @@ -106,8 +108,7 @@ #define BM_SMOOTH (15) #define BM_ACTIVE (16) #define BM_NONORMCALC (17) -#define BM_PINNED (18) -#define BM_FLIPPED (19) /*internal flag, used for ensuring correct normals during multires interpolation*/ +#define BM_FLIPPED (18) /*internal flag, used for ensuring correct normals during multires interpolation*/ #include bmesh_class.h @@ -142,15 +143,19 @@ struct BMFace *BM_Make_Ngon ( struct BMesh *bm, struct BMVert *v1, struct BMVert *v2, struct BMEdge **edges, int len, int nodouble ); /*stuff for dealing with header flags*/ -#define BM_TestHFlag(ele, f) (ele (((BMHeader*)ele)-flag (f))) -#define BM_SetHFlag(ele, f) (((BMHeader*)ele)-flag = ((BMHeader*)ele)-flag | (f)) -#define BM_ClearHFlag(ele, f) (((BMHeader*)ele)-flag = ((BMHeader*)ele)-flag ~(f)) -#define BM_ToggleHFlag(ele, f) (((BMHeader*)ele)-flag = ((BMHeader*)ele)-flag ^ (f)) +BM_INLINE int BM_TestHFlag(void *element, int flag); -/*stuff for setting indices in elements.*/ -#define BMINDEX_SET(ele, i) (((BMHeader*)ele)-index = i) -#define BMINDEX_GET(ele) (((BMHeader*)ele)-index) +/*stuff for dealing with header flags*/ +BM_INLINE void BM_SetHFlag(void *element, int flag); +/*stuff for dealing with header flags*/ +BM_INLINE void BM_ClearHFlag(void *element, int flag); + +/*stuff for dealing BM_ToggleHFlag header flags*/ +BM_INLINE void BM_ToggleHFlag(void *element, int flag); +BM_INLINE void BMINDEX_SET(void *element, int index); +BM_INLINE int BMINDEX_GET(void *element); + /*copies loop data from adjacent faces*/ void BM_Face_CopyShared ( BMesh *bm, BMFace *f ); @@ -309,126 +314,10 @@ #include bmesh_error.h #include bmesh_queries.h
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36629] branches/bmesh/blender: svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 36629 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36629 Author: campbellbarton Date: 2011-05-12 05:35:19 + (Thu, 12 May 2011) Log Message: --- svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender Revision Links: -- http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36603 Modified Paths: -- branches/bmesh/blender/doc/doxygen/doxygen.source branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h branches/bmesh/blender/source/blender/CMakeLists.txt branches/bmesh/blender/source/blender/SConscript branches/bmesh/blender/source/blender/blenkernel/BKE_brush.h branches/bmesh/blender/source/blender/blenkernel/intern/brush.c branches/bmesh/blender/source/blender/blenloader/CMakeLists.txt branches/bmesh/blender/source/blender/blenloader/SConscript branches/bmesh/blender/source/blender/blenloader/intern/readblenentry.c branches/bmesh/blender/source/blender/blenloader/intern/readfile.c branches/bmesh/blender/source/blender/editors/physics/particle_edit.c branches/bmesh/blender/source/blender/editors/physics/physics_intern.h branches/bmesh/blender/source/blender/editors/physics/physics_ops.c branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_intern.h branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h branches/bmesh/blender/source/blender/makesrna/intern/rna_sculpt_paint.c branches/bmesh/blender/source/blender/makesrna/intern/rna_smoke.c branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c branches/bmesh/blender/source/blender/windowmanager/WM_api.h branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c branches/bmesh/blender/source/blenderplayer/CMakeLists.txt branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c branches/bmesh/blender/source/creator/CMakeLists.txt branches/bmesh/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp branches/bmesh/blender/source/gameengine/GamePlayer/ghost/SConscript Added Paths: --- branches/bmesh/blender/source/blender/blenloader/BLO_runtime.h branches/bmesh/blender/source/blender/blenloader/intern/runtime.c Removed Paths: - branches/bmesh/blender/source/blender/readblenfile/ branches/bmesh/blender/source/tools/darwin/ Property Changed: branches/bmesh/blender/ branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c Property changes on: branches/bmesh/blender ___ Modified: svn:mergeinfo
