[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18866] branches/bmesh/blender: merge with 2.5 at r18865
Joseph Eagar
joeedh at gmail.com
Sun Feb 8 15:25:07 CET 2009
Revision: 18866
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18866
Author: joeedh
Date: 2009-02-08 15:25:04 +0100 (Sun, 08 Feb 2009)
Log Message:
-----------
merge with 2.5 at r18865
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/bmesh/blender/source/Makefile
branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
branches/bmesh/blender/source/blender/blenkernel/intern/action.c
branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
branches/bmesh/blender/source/blender/blenkernel/intern/context.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/ipo.c
branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/editors/Makefile
branches/bmesh/blender/source/blender/editors/SConscript
branches/bmesh/blender/source/blender/editors/animation/anim_deps.c
branches/bmesh/blender/source/blender/editors/armature/armature_intern.h
branches/bmesh/blender/source/blender/editors/armature/armature_ops.c
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/armature/poseobject.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/include/BIF_transform.h
branches/bmesh/blender/source/blender/editors/include/ED_anim_api.h
branches/bmesh/blender/source/blender/editors/include/ED_armature.h
branches/bmesh/blender/source/blender/editors/include/ED_image.h
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/include/ED_screen.h
branches/bmesh/blender/source/blender/editors/include/ED_util.h
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/include/UI_resources.h
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_intern.h
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/interface/view2d_ops.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_lib.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_loop.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_mods.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/object/object_intern.h
branches/bmesh/blender/source/blender/editors/object/object_ops.c
branches/bmesh/blender/source/blender/editors/screen/Makefile
branches/bmesh/blender/source/blender/editors/screen/SConscript
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/editors/screen/screen_edit.c
branches/bmesh/blender/source/blender/editors/screen/screen_intern.h
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/sculpt/sculpt.c
branches/bmesh/blender/source/blender/editors/space_action/action_edit.c
branches/bmesh/blender/source/blender/editors/space_action/action_header.c
branches/bmesh/blender/source/blender/editors/space_action/space_action.c
branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c
branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
branches/bmesh/blender/source/blender/editors/space_image/image_draw.c
branches/bmesh/blender/source/blender/editors/space_image/image_header.c
branches/bmesh/blender/source/blender/editors/space_image/image_render.c
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
branches/bmesh/blender/source/blender/editors/space_info/info_header.c
branches/bmesh/blender/source/blender/editors/space_info/space_info.c
branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_node/node_header.c
branches/bmesh/blender/source/blender/editors/space_node/node_intern.h
branches/bmesh/blender/source/blender/editors/space_node/node_ops.c
branches/bmesh/blender/source/blender/editors/space_node/node_select.c
branches/bmesh/blender/source/blender/editors/space_node/node_state.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
branches/bmesh/blender/source/blender/editors/util/undo.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_intern.h
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/makesdna/DNA_action_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_action.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_armature.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
branches/bmesh/blender/source/blender/render/intern/include/render_types.h
branches/bmesh/blender/source/blender/render/intern/source/envmap.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/windowmanager/WM_api.h
branches/bmesh/blender/source/blender/windowmanager/WM_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_draw.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_gesture.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_window.c
Added Paths:
-----------
branches/bmesh/blender/source/blender/editors/interface/interface_utils.c
branches/bmesh/blender/source/blender/editors/space_graph/
branches/bmesh/blender/source/blender/editors/space_graph/Makefile
branches/bmesh/blender/source/blender/editors/space_graph/SConscript
branches/bmesh/blender/source/blender/editors/space_graph/graph_draw.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_edit.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_header.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_intern.h
branches/bmesh/blender/source/blender/editors/space_graph/graph_ops.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_select.c
branches/bmesh/blender/source/blender/editors/space_graph/space_graph.c
Removed Paths:
-------------
branches/bmesh/blender/source/blender/editors/space_graph/Makefile
branches/bmesh/blender/source/blender/editors/space_graph/SConscript
branches/bmesh/blender/source/blender/editors/space_graph/graph_draw.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_edit.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_header.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_intern.h
branches/bmesh/blender/source/blender/editors/space_graph/graph_ops.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_select.c
branches/bmesh/blender/source/blender/editors/space_graph/space_graph.c
branches/bmesh/blender/source/blender/editors/space_ipo/
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2009-02-08 13:01:50 UTC (rev 18865)
+++ branches/bmesh/blender/CMakeLists.txt 2009-02-08 14:25:04 UTC (rev 18866)
@@ -198,7 +198,7 @@
SET(PLATFORM_LINKFLAGS "-pthread")
# Better warnings
- SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Waggregate-return -Wnested-externs -Wdeclaration-after-statement")
+ SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wnested-externs -Wdeclaration-after-statement")
INCLUDE_DIRECTORIES(/usr/include /usr/local/include)
ENDIF(UNIX)
Modified: branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-02-08 13:01:50 UTC (rev 18865)
+++ branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-02-08 14:25:04 UTC (rev 18866)
@@ -383,6 +383,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\interface\interface_utils.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\interface\keyval.c"
>
</File>
@@ -564,34 +568,34 @@
</File>
</Filter>
<Filter
- Name="space_ipo"
+ Name="space_graph"
>
<File
- RelativePath="..\..\..\source\blender\editors\space_ipo\ipo_draw.c"
+ RelativePath="..\..\..\source\blender\editors\space_graph\graph_draw.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\editors\space_ipo\ipo_edit.c"
+ RelativePath="..\..\..\source\blender\editors\space_graph\graph_edit.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\editors\space_ipo\ipo_header.c"
+ RelativePath="..\..\..\source\blender\editors\space_graph\graph_header.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\editors\space_ipo\ipo_intern.h"
+ RelativePath="..\..\..\source\blender\editors\space_graph\graph_intern.h"
>
</File>
<File
- RelativePath="..\..\..\source\blender\editors\space_ipo\ipo_ops.c"
+ RelativePath="..\..\..\source\blender\editors\space_graph\graph_ops.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\editors\space_ipo\ipo_select.c"
+ RelativePath="..\..\..\source\blender\editors\space_graph\graph_select.c"
>
</File>
<File
- RelativePath="..\..\..\source\blender\editors\space_ipo\space_ipo.c"
+ RelativePath="..\..\..\source\blender\editors\space_graph\space_graph.c"
>
</File>
</Filter>
@@ -1083,6 +1087,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\armature\armature_ops.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\armature\editarmature.c"
>
</File>
Modified: branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
--- branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2009-02-08 13:01:50 UTC (rev 18865)
+++ branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2009-02-08 14:25:04 UTC (rev 18866)
@@ -653,10 +653,6 @@
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna_ipo.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_key.c"
>
</File>
Modified: branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
===================================================================
--- branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj 2009-02-08 13:01:50 UTC (rev 18865)
+++ branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj 2009-02-08 14:25:04 UTC (rev 18866)
@@ -223,10 +223,6 @@
>
</File>
<File
- RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_ipo_gen.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna.crna_key_gen.c"
>
</File>
Modified: branches/bmesh/blender/source/Makefile
===================================================================
--- branches/bmesh/blender/source/Makefile 2009-02-08 13:01:50 UTC (rev 18865)
+++ branches/bmesh/blender/source/Makefile 2009-02-08 14:25:04 UTC (rev 18866)
@@ -232,8 +232,7 @@
PULIB += $(OCGDIR)/blender/ed_info/libed_info.a
PULIB += $(OCGDIR)/blender/ed_buttons/libed_buttons.a
PULIB += $(OCGDIR)/blender/ed_node/libed_node.a
-PULIB += $(OCGDIR)/blender/ed_image/libed_image.a
-PULIB += $(OCGDIR)/blender/ed_ipo/libed_ipo.a
+PULIB += $(OCGDIR)/blender/ed_graph/libed_graph.a
PULIB += $(OCGDIR)/blender/ed_outliner/libed_outliner.a
PULIB += $(OCGDIR)/blender/ed_time/libed_time.a
PULIB += $(OCGDIR)/blender/ed_preview/libed_preview.a
@@ -248,8 +247,9 @@
PULIB += $(OCGDIR)/blender/ed_animation/libed_animation.a
PULIB += $(OCGDIR)/blender/ed_transform/libed_transform.a
PULIB += $(OCGDIR)/blender/ed_util/libed_util.a
+PULIB += $(OCGDIR)/blender/ed_datafiles/libed_datafiles.a
+PULIB += $(OCGDIR)/blender/ed_image/libed_image.a
PULIB += $(OCGDIR)/blender/ed_uvedit/libed_uvedit.a
-PULIB += $(OCGDIR)/blender/ed_datafiles/libed_datafiles.a
PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a
PULIB += $(OCGDIR)/blender/windowmanager/libwindowmanager.a
PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_context.h 2009-02-08 13:01:50 UTC (rev 18865)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_context.h 2009-02-08 14:25:04 UTC (rev 18866)
@@ -51,6 +51,8 @@
struct ToolSettings;
struct Image;
struct ImBuf;
+struct EditBone;
+struct bPoseChannel;
struct wmWindow;
struct wmWindowManager;
@@ -81,7 +83,14 @@
CTX_DATA_EDIT_IMAGE,
CTX_DATA_EDIT_IMAGE_BUFFER,
- CTX_DATA_SELECTED_NODES
+ CTX_DATA_SELECTED_NODES,
+
+ CTX_DATA_SELECTED_BONES,
+ CTX_DATA_SELECTED_EDITABLE_BONES,
+ CTX_DATA_SELECTED_PCHANS,
+
+ CTX_DATA_ACTIVE_BONE,
+ CTX_DATA_ACTIVE_PCHAN,
};
typedef int bContextDataMember;
@@ -185,6 +194,13 @@
int CTX_data_selected_nodes(const bContext *C, ListBase *list);
+struct EditBone *CTX_data_active_bone(const bContext *C);
+int CTX_data_selected_bones(const bContext *C, ListBase *list);
+int CTX_data_selected_editable_bones(const bContext *C, ListBase *list);
+
+struct bPoseChannel *CTX_data_active_pchan(const bContext *C);
+int CTX_data_selected_pchans(const bContext *C, ListBase *list);
+
/* Data Evaluation Context */
float CTX_eval_frame(const bContext *C);
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_node.h 2009-02-08 13:01:50 UTC (rev 18865)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_node.h 2009-02-08 14:25:04 UTC (rev 18866)
@@ -52,9 +52,6 @@
struct GPUNode;
struct GPUNodeStack;
-#define SOCK_IN 1
-#define SOCK_OUT 2
-
/* ************** NODE TYPE DEFINITIONS ***** */
typedef struct bNodeSocketType {
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h 2009-02-08 13:01:50 UTC (rev 18865)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h 2009-02-08 14:25:04 UTC (rev 18866)
@@ -224,7 +224,7 @@
#define V_DECLARE(vec) int _##vec##_count=0; void *_##vec##_tmp
/*this returns the entire size of the array, including any buffering.*/
-#define V_SIZE(vec) ((vec)==NULL ? 0 : MEM_allocN_len(vec) / sizeof(*vec))
+#define V_SIZE(vec) ((signed int)((vec)==NULL ? 0 : MEM_allocN_len(vec) / sizeof(*vec)))
/*this returns the logical size of the array, not including buffering.*/
#define V_COUNT(vec) _##vec##_count
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/action.c 2009-02-08 13:01:50 UTC (rev 18865)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/action.c 2009-02-08 14:25:04 UTC (rev 18866)
@@ -511,7 +511,7 @@
repeat = (strip->flag & ACTSTRIP_USESTRIDE) ? (1.0f) : (strip->repeat);
if (strip->scale == 0.0f) strip->scale= 1.0f;
- scale = fabs(strip->scale); /* scale must be positive (for now) */
+ scale = (float)fabs(strip->scale); /* scale must be positive (for now) */
actlength = strip->actend-strip->actstart;
if (actlength == 0.0f) actlength = 1.0f;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/brush.c 2009-02-08 13:01:50 UTC (rev 18865)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/brush.c 2009-02-08 14:25:04 UTC (rev 18866)
@@ -242,10 +242,18 @@
if(cm->curve)
MEM_freeN(cm->curve);
+ if(preset == BRUSH_PRESET_SHARP)
+ cm->totpoint= 3;
+ if(preset == BRUSH_PRESET_SMOOTH)
+ cm->totpoint= 6;
+ if(preset == BRUSH_PRESET_MAX)
+ cm->totpoint= 2;
+
+
+ cm->curve= MEM_callocN(cm->totpoint*sizeof(CurveMapPoint), "curve points");
+ cm->flag &= ~CUMA_EXTEND_EXTRAPOLATE;
+
if(preset == BRUSH_PRESET_SHARP) {
- cm->curve= MEM_callocN(3*sizeof(CurveMapPoint), "curve points");
- cm->flag &= ~CUMA_EXTEND_EXTRAPOLATE;
- cm->totpoint= 3;
cm->curve[0].x= 0;
cm->curve[0].y= 1;
cm->curve[1].x= 0.33;
@@ -254,10 +262,24 @@
cm->curve[2].y= 0;
}
else if(preset == BRUSH_PRESET_SMOOTH) {
- // XXX: todo
+ cm->curve[0].x= 0;
+ cm->curve[0].y= 1;
+ cm->curve[1].x= 0.1;
+ cm->curve[1].y= 0.97553;
+ cm->curve[2].x= 0.3;
+ cm->curve[2].y= 0.79389;
+ cm->curve[3].x= 0.9;
+ cm->curve[3].y= 0.02447;
+ cm->curve[4].x= 0.7;
+ cm->curve[4].y= 0.20611;
+ cm->curve[5].x= 1;
+ cm->curve[5].y= 0;
}
else if(preset == BRUSH_PRESET_MAX) {
- // XXX: todo
+ cm->curve[0].x= 0;
+ cm->curve[0].y= 1;
+ cm->curve[1].x= 1;
+ cm->curve[1].y= 1;
}
curvemapping_changed(b->curve, 0);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list