[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23520] trunk/blender/source/blender/ editors: Fix #19482: setting cursor position in uv editor was not correct
Revision: 23520 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23520 Author: blendix Date: 2009-09-28 10:52:02 +0200 (Mon, 28 Sep 2009) Log Message: --- Fix #19482: setting cursor position in uv editor was not correct zoomed in, needed to make view2d offset for pixel rounding dependent on zoom level. Modified Paths: -- trunk/blender/source/blender/editors/interface/view2d.c trunk/blender/source/blender/editors/space_image/space_image.c Modified: trunk/blender/source/blender/editors/interface/view2d.c === --- trunk/blender/source/blender/editors/interface/view2d.c 2009-09-28 06:03:55 UTC (rev 23519) +++ trunk/blender/source/blender/editors/interface/view2d.c 2009-09-28 08:52:02 UTC (rev 23520) @@ -973,8 +973,8 @@ /* XXX brecht: instead of zero at least use a tiny offset, otherwise * pixel rounding is effectively random due to float inaccuracy */ - xofs= 0.001f; - yofs= 0.001f; + xofs= 0.001f*(v2d-cur.xmax - v2d-cur.xmin)/(v2d-mask.xmax - v2d-mask.xmin); + yofs= 0.001f*(v2d-cur.ymax - v2d-cur.ymin)/(v2d-mask.ymax - v2d-mask.ymin); /* apply mask-based adjustments to cur rect (due to scrollers), to eliminate scaling artifacts */ view2d_map_cur_using_mask(v2d, curmasked); Modified: trunk/blender/source/blender/editors/space_image/space_image.c === --- trunk/blender/source/blender/editors/space_image/space_image.c 2009-09-28 06:03:55 UTC (rev 23519) +++ trunk/blender/source/blender/editors/space_image/space_image.c 2009-09-28 08:52:02 UTC (rev 23520) @@ -374,8 +374,8 @@ ar-v2d.mask.ymax= winy; /* which part of the image space do we see? */ - x1= ar-winrct.xmin+(winx-sima-zoom*w)/2; - y1= ar-winrct.ymin+(winy-sima-zoom*h)/2; + x1= ar-winrct.xmin+(winx-sima-zoom*w)/2.0f; + y1= ar-winrct.ymin+(winy-sima-zoom*h)/2.0f; x1-= sima-zoom*sima-xof; y1-= sima-zoom*sima-yof; @@ -440,11 +440,13 @@ /* and uvs in 0.0-1.0 space */ UI_view2d_view_ortho(C, v2d); - draw_uvedit_main(sima, ar, scene, obedit); - ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST); + draw_uvedit_main(sima, ar, scene, obedit); + + ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST); - /* Grease Pencil too (in addition to UV's) */ - draw_image_grease_pencil((bContext *)C, 1); + /* Grease Pencil too (in addition to UV's) */ + draw_image_grease_pencil((bContext *)C, 1); + UI_view2d_view_restore(C); /* draw Grease Pencil - screen space only */ ___ 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 [23521] trunk/blender/source/blender/imbuf /intern/divers.c: Fix #19470: displaying depth pass could crash, conversion from
Revision: 23521
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23521
Author: blendix
Date: 2009-09-28 11:06:28 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19470: displaying depth pass could crash, conversion from
float to byte was not working correct.
Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/divers.c
Modified: trunk/blender/source/blender/imbuf/intern/divers.c
===
--- trunk/blender/source/blender/imbuf/intern/divers.c 2009-09-28 08:52:02 UTC
(rev 23520)
+++ trunk/blender/source/blender/imbuf/intern/divers.c 2009-09-28 09:06:28 UTC
(rev 23521)
@@ -190,7 +190,11 @@
to = (unsigned char *) ibuf-rect;
}
- if (profile == IB_PROFILE_SRGB (channels == 3 || channels == 4)) {
+ if(channels==1) {
+ for (i = ibuf-x * ibuf-y; i 0; i--, to+=4, tof++)
+ to[1]= to[2]= to[3]= to[0] = FTOCHAR(tof[0]);
+ }
+ else if (profile == IB_PROFILE_SRGB) {
if(channels == 3) {
for (i = ibuf-x * ibuf-y; i 0; i--, to+=4, tof+=3) {
srgb[0]= linearrgb_to_srgb(tof[0]);
@@ -207,12 +211,8 @@
floatbuf_to_srgb_byte(tof, to, 0, ibuf-x, 0, ibuf-y,
ibuf-x);
}
}
- else if(ELEM(profile, IB_PROFILE_NONE, IB_PROFILE_LINEAR_RGB)
(dither==0.0f || channels!=4)) {
- if(channels==1) {
- for (i = ibuf-x * ibuf-y; i 0; i--, to+=4, tof++)
- to[1]= to[2]= to[3]= to[0] = FTOCHAR(tof[0]);
- }
- else if(channels==3) {
+ else if(ELEM(profile, IB_PROFILE_NONE, IB_PROFILE_LINEAR_RGB)
dither==0.0f) {
+ if(channels==3) {
for (i = ibuf-x * ibuf-y; i 0; i--, to+=4, tof+=3) {
to[0] = FTOCHAR(tof[0]);
to[1] = FTOCHAR(tof[1]);
___
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 [23522] branches/blender2.4/source/blender /render/intern/source/rayshade.c: svn merge https://svn.blender.org/svnroot /bf-blender/trunk/blender -r234
Revision: 23522
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23522
Author: campbellbarton
Date: 2009-09-28 11:59:21 +0200 (Mon, 28 Sep 2009)
Log Message:
---
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23427:23428
[#8358] Performance regression with raytraced refraction (from Matt Ebb)
Modified Paths:
--
branches/blender2.4/source/blender/render/intern/source/rayshade.c
Modified: branches/blender2.4/source/blender/render/intern/source/rayshade.c
===
--- branches/blender2.4/source/blender/render/intern/source/rayshade.c
2009-09-28 09:06:28 UTC (rev 23521)
+++ branches/blender2.4/source/blender/render/intern/source/rayshade.c
2009-09-28 09:59:21 UTC (rev 23522)
@@ -1868,7 +1868,8 @@
else max_samples = 1;
} else {
if (do_soft) max_samples = lar-ray_totsamp;
- else max_samples = (R.osa 4)?R.osa:5;
+ else if (shi-depth == 0) max_samples = (R.osa 4)?R.osa:5;
+ else max_samples = 1;
}
ray_shadow_jittered_coords(shi, max_samples, jitco, totjitco);
___
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 [23523] trunk/blender: Durian Feature Request: Rotation Modes for Objects
Revision: 23523 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23523 Author: aligorith Date: 2009-09-28 12:19:20 +0200 (Mon, 28 Sep 2009) Log Message: --- Durian Feature Request: Rotation Modes for Objects This (biggish) commit generalises the rotation modes functionality added for Bones, allowing Objects to use the various Euler Rotation orders, Axis-Angle, and Quaternion rotation representations. I've also cleaned up the nomenclature of the rotation-related settings so that the naming styles are more consistent with each other. Unfortunately, this will break all files involving object or bone rotation animation made in 2.5 versions (2.4x will still get correctly converted). General Notes: * By default, Objects still default to using Eulers, while Bones will use Quaternions by default still. * I've fixed all areas that I'm currently aware of to work with these changes. However, there are probably a few places where I've missed a few changes (i.e. auto-keyframing will need attention later). * Removed the old IPO-Keys stuff from Transform code. I'm unlikely to restore this in the near future, and trying to fix that to include support for this commit would have been too much work. Modified Paths: -- trunk/blender/release/scripts/ui/buttons_data_bone.py trunk/blender/release/scripts/ui/buttons_object.py trunk/blender/source/blender/blenkernel/BKE_armature.h trunk/blender/source/blender/blenkernel/intern/armature.c trunk/blender/source/blender/blenkernel/intern/constraint.c trunk/blender/source/blender/blenkernel/intern/ipo.c trunk/blender/source/blender/blenkernel/intern/object.c trunk/blender/source/blender/blenlib/BLI_arithb.h trunk/blender/source/blender/blenloader/intern/readfile.c trunk/blender/source/blender/editors/animation/keyframing.c trunk/blender/source/blender/editors/animation/keyingsets.c trunk/blender/source/blender/editors/armature/editarmature.c trunk/blender/source/blender/editors/armature/poseSlide.c trunk/blender/source/blender/editors/armature/poseobject.c trunk/blender/source/blender/editors/object/object_transform.c trunk/blender/source/blender/editors/space_graph/graph_edit.c trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c trunk/blender/source/blender/editors/transform/transform.c trunk/blender/source/blender/editors/transform/transform.h trunk/blender/source/blender/editors/transform/transform_conversions.c trunk/blender/source/blender/editors/transform/transform_generics.c trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp trunk/blender/source/blender/makesdna/DNA_action_types.h trunk/blender/source/blender/makesdna/DNA_anim_types.h trunk/blender/source/blender/makesdna/DNA_object_types.h trunk/blender/source/blender/makesrna/RNA_types.h trunk/blender/source/blender/makesrna/intern/makesrna.c trunk/blender/source/blender/makesrna/intern/rna_access.c trunk/blender/source/blender/makesrna/intern/rna_object.c trunk/blender/source/blender/makesrna/intern/rna_pose.c Modified: trunk/blender/release/scripts/ui/buttons_data_bone.py === --- trunk/blender/release/scripts/ui/buttons_data_bone.py 2009-09-28 09:59:21 UTC (rev 23522) +++ trunk/blender/release/scripts/ui/buttons_data_bone.py 2009-09-28 10:19:20 UTC (rev 23523) @@ -57,20 +57,16 @@ col = row.column() if pchan.rotation_mode == 'QUATERNION': - col.itemR(pchan, rotation, text=Rotation) + col.itemR(pchan, rotation_quaternion, text=Rotation) elif pchan.rotation_mode == 'AXIS_ANGLE': - col.itemL(text=Rotation) - col.itemR(pchan, rotation_angle, text=Angle) - col.itemR(pchan, rotation_axis, text=Axis) + #col.itemL(text=Rotation) + #col.itemR(pchan, rotation_angle, text=Angle) + #col.itemR(pchan, rotation_axis, text=Axis) + col.itemR(pchan, rotation_axis_angle, text=Rotation) else: - col.itemR(pchan, euler_rotation, text=Rotation) + col.itemR(pchan, rotation_euler, text=Rotation) row.column().itemR(pchan, scale) - - if pchan.rotation_mode == 'QUATERNION': - col = layout.column(align=True) - col.itemL(text=Euler:) - col.row().itemR(pchan, euler_rotation, text=) class BONE_PT_transform_locks(BoneButtonsPanel): __label__ =
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23524] branches/soc-2009-jaguarandi/ source/blender/render: Raycounters fix
Revision: 23524
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23524
Author: jaguarandi
Date: 2009-09-28 12:25:12 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Raycounters fix
Modified Paths:
--
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
branches/soc-2009-jaguarandi/source/blender/render/intern/include/raycounter.h
branches/soc-2009-jaguarandi/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2009-jaguarandi/source/blender/render/intern/source/shadeinput.c
Modified:
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
===
---
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
2009-09-28 10:19:20 UTC (rev 23523)
+++
branches/soc-2009-jaguarandi/source/blender/render/extern/include/RE_raytrace.h
2009-09-28 10:25:12 UTC (rev 23524)
@@ -35,20 +35,31 @@
extern C {
#endif
-//#define RE_RAYCOUNTER/* enable counters per ray,
usefull for measuring raytrace structures performance */
+#define RE_RAYCOUNTER /* enable counters per ray, usefull for
measuring raytrace structures performance */
#define RE_RAY_LCTS_MAX_SIZE 256
#define RT_USE_LAST_HIT/* last shadow hit is reused
before raycasting on whole tree */
//#define RT_USE_HINT /* last hit object is reused before
raycasting on whole tree */
+#ifdef RE_RAYCOUNTER
+typedef struct RayCounter RayCounter;
+struct RayCounter
+{
+ struct
+ {
+ unsigned long long test, hit;
+
+ } faces, bb, simd_bb, raycast, raytrace_hint, rayshadow_last_hit;
+};
+#endif
+
/* Internals about raycasting structures can be found on intern/raytree.h */
typedef struct RayObject RayObject;
typedef struct Isect Isect;
typedef struct RayHint RayHint;
typedef struct RayTraceHint RayTraceHint;
-typedef struct RayCounter RayCounter;
struct DerivedMesh;
struct Mesh;
Modified:
branches/soc-2009-jaguarandi/source/blender/render/intern/include/raycounter.h
===
---
branches/soc-2009-jaguarandi/source/blender/render/intern/include/raycounter.h
2009-09-28 10:19:20 UTC (rev 23523)
+++
branches/soc-2009-jaguarandi/source/blender/render/intern/include/raycounter.h
2009-09-28 10:25:12 UTC (rev 23524)
@@ -34,17 +34,6 @@
#ifdef RE_RAYCOUNTER
-typedef struct RayCounter RayCounter;
-struct RayCounter
-{
-
- struct
- {
- unsigned long long test, hit;
-
- } faces, bb, simd_bb, raycast, raytrace_hint, rayshadow_last_hit;
-};
-
/* #define RE_RC_INIT(isec, shi) (isec).count = re_rc_counter+(shi).thread */
#define RE_RC_INIT(isec, shi) (isec).raycounter = ((shi).raycounter)
void RE_RC_INFO (RayCounter *rc);
Modified:
branches/soc-2009-jaguarandi/source/blender/render/intern/raytrace/rayobject.cpp
===
---
branches/soc-2009-jaguarandi/source/blender/render/intern/raytrace/rayobject.cpp
2009-09-28 10:19:20 UTC (rev 23523)
+++
branches/soc-2009-jaguarandi/source/blender/render/intern/raytrace/rayobject.cpp
2009-09-28 10:25:12 UTC (rev 23524)
@@ -189,6 +189,7 @@
if(is-orig.ob == face-ob is-orig.face == face-face)
return 0;
+/*
if(is-skip RE_SKIP_VLR_RENDER_CHECK)
{
if(vlr_check_intersect(is, (ObjectInstanceRen*)face-ob,
(VlakRen*)face-face ) == 0)
@@ -204,7 +205,7 @@
if(rayface_check_cullface(face, is) == 0)
return 0;
}
-
+*/
RE_RC_COUNT(is-raycounter-faces.test);
//Load coords
Modified:
branches/soc-2009-jaguarandi/source/blender/render/intern/source/shadeinput.c
===
---
branches/soc-2009-jaguarandi/source/blender/render/intern/source/shadeinput.c
2009-09-28 10:19:20 UTC (rev 23523)
+++
branches/soc-2009-jaguarandi/source/blender/render/intern/source/shadeinput.c
2009-09-28 10:25:12 UTC (rev 23524)
@@ -243,9 +243,9 @@
shr-rayhits[1] = (float)shi-raycounter.bb.hit;
shr-rayhits[2] = 0.0;
shr-rayhits[3] = 1.0;
- RE_RC_MERGE(re_rc_counter[shi-thread], shi-raycounter);
}
*/
+ RE_RC_MERGE(re_rc_counter[shi-thread], shi-raycounter);
}
/*
*/
___
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 [23525] trunk/blender/source/gameengine/ Converter/BL_ArmatureChannel.cpp: Compile fix for GameEngine
Revision: 23525 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23525 Author: aligorith Date: 2009-09-28 13:29:07 +0200 (Mon, 28 Sep 2009) Log Message: --- Compile fix for GameEngine Modified Paths: -- trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp === --- trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp 2009-09-28 10:25:12 UTC (rev 23524) +++ trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp 2009-09-28 11:29:07 UTC (rev 23525) @@ -117,9 +117,9 @@ KX_PYATTRIBUTE_FLAG_RO(ik_lin_control,bPoseChannel,ikflag, BONE_IK_LINCTL), KX_PYATTRIBUTE_FLOAT_VECTOR_RW(location,-FLT_MAX,FLT_MAX,bPoseChannel,loc,3), KX_PYATTRIBUTE_FLOAT_VECTOR_RW(scale,-FLT_MAX,FLT_MAX,bPoseChannel,size,3), - KX_PYATTRIBUTE_FLOAT_VECTOR_RW(rotation,-1.0f,1.0f,bPoseChannel,quat,4), - KX_PYATTRIBUTE_FLOAT_VECTOR_RW(euler_rotation,-10.f,10.f,bPoseChannel,eul,3), - KX_PYATTRIBUTE_SHORT_RW(rotation_mode,0,PCHAN_ROT_MAX-1,false,bPoseChannel,rotmode), + KX_PYATTRIBUTE_FLOAT_VECTOR_RW(rotation_quaternion,-1.0f,1.0f,bPoseChannel,quat,4), + KX_PYATTRIBUTE_FLOAT_VECTOR_RW(rotaion_euler,-10.f,10.f,bPoseChannel,eul,3), + KX_PYATTRIBUTE_SHORT_RW(rotation_mode,0,ROT_MODE_MAX-1,false,bPoseChannel,rotmode), KX_PYATTRIBUTE_FLOAT_MATRIX_RO(channel_matrix,bPoseChannel,chan_mat,4), KX_PYATTRIBUTE_FLOAT_MATRIX_RO(pose_matrix,bPoseChannel,pose_mat,4), KX_PYATTRIBUTE_FLOAT_VECTOR_RO(pose_head,bPoseChannel,pose_head,3), ___ 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 [23526] trunk/blender: jpeg2000 presets were broken.
Revision: 23526
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23526
Author: campbellbarton
Date: 2009-09-28 14:10:13 +0200 (Mon, 28 Sep 2009)
Log Message:
---
jpeg2000 presets were broken.
Modified Paths:
--
trunk/blender/release/scripts/ui/buttons_scene.py
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/release/scripts/ui/buttons_scene.py
===
--- trunk/blender/release/scripts/ui/buttons_scene.py 2009-09-28 11:29:07 UTC
(rev 23525)
+++ trunk/blender/release/scripts/ui/buttons_scene.py 2009-09-28 12:10:13 UTC
(rev 23526)
@@ -254,12 +254,11 @@
split = layout.split()
col = split.column()
col.itemL(text=Depth:)
- col.row().itemR(rd, jpeg_depth, expand=True)
+ col.row().itemR(rd, jpeg2k_depth, expand=True)
col = split.column()
- col.itemR(rd, jpeg_preset, text=)
- col.itemR(rd, jpeg_ycc)
- col.itemR(rd, exr_preview)
+ col.itemR(rd, jpeg2k_preset, text=)
+ col.itemR(rd, jpeg2k_ycc)
elif rd.file_format in ('CINEON', 'DPX'):
split = layout.split()
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c2009-09-28
11:29:07 UTC (rev 23525)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c2009-09-28
12:10:13 UTC (rev 23526)
@@ -257,6 +257,41 @@
#endif
}
+void rna_SceneRenderData_jpeg2k_preset_update(RenderData *rd)
+{
+ rd-subimtype = ~(R_JPEG2K_12BIT|R_JPEG2K_16BIT |
R_JPEG2K_CINE_PRESET|R_JPEG2K_CINE_48FPS);
+
+ switch(rd-jp2_depth) {
+ case 8: break;
+ case 12:rd-subimtype |= R_JPEG2K_12BIT; break;
+ case 16:rd-subimtype |= R_JPEG2K_16BIT; break;
+ }
+
+ switch(rd-jp2_preset) {
+ case 1: rd-subimtype |= R_JPEG2K_CINE_PRESET;
break;
+ case 2: rd-subimtype |= R_JPEG2K_CINE_PRESET|R_JPEG2K_CINE_48FPS;
break;
+ case 3: rd-subimtype |= R_JPEG2K_CINE_PRESET;
break;
+ case 4: rd-subimtype |= R_JPEG2K_CINE_PRESET;
break;
+ case 5: rd-subimtype |= R_JPEG2K_CINE_PRESET|R_JPEG2K_CINE_48FPS;
break;
+ case 6: rd-subimtype |= R_JPEG2K_CINE_PRESET;
break;
+ case 7: rd-subimtype |= R_JPEG2K_CINE_PRESET|R_JPEG2K_CINE_48FPS;
break;
+ }
+}
+
+static void rna_SceneRenderData_jpeg2k_preset_set(PointerRNA *ptr, int value)
+{
+ RenderData *rd= (RenderData*)ptr-data;
+ rd-jp2_preset= value;
+ rna_SceneRenderData_jpeg2k_preset_update(rd);
+}
+
+static void rna_SceneRenderData_jpeg2k_depth_set(PointerRNA *ptr, int value)
+{
+ RenderData *rd= (RenderData*)ptr-data;
+ rd-jp2_depth= value;
+ rna_SceneRenderData_jpeg2k_preset_update(rd);
+}
+
static int rna_SceneRenderData_active_layer_index_get(PointerRNA *ptr)
{
RenderData *rd= (RenderData*)ptr-data;
@@ -1229,19 +1264,19 @@
#ifdef WITH_OPENJPEG
static EnumPropertyItem jp2_preset_items[] = {
{0, NO_PRESET, 0, No Preset, },
- {1, R_JPEG2K_CINE_PRESET, 0, Cinema 24fps 2048x1080, },
- {2, R_JPEG2K_CINE_PRESET|R_JPEG2K_CINE_48FPS, 0, Cinema
48fps 2048x1080, },
- {3, R_JPEG2K_CINE_PRESET, 0, Cinema 24fps 4096x2160, },
- {4, R_JPEG2K_CINE_PRESET, 0, Cine-Scope 24fps 2048x858, },
- {5, R_JPEG2K_CINE_PRESET|R_JPEG2K_CINE_48FPS, 0, Cine-Scope
48fps 2048x858, },
- {6, R_JPEG2K_CINE_PRESET, 0, Cine-Flat 24fps 1998x1080, },
- {7, R_JPEG2K_CINE_PRESET|R_JPEG2K_CINE_48FPS, 0, Cine-Flat
48fps 1998x1080, },
+ {1, CINE_24FPS, 0, Cinema 24fps 2048x1080, },
+ {2, CINE_48FPS, 0, Cinema 48fps 2048x1080, },
+ {3, CINE_24FPS_4K, 0, Cinema 24fps 4096x2160, },
+ {4, CINE_SCOPE_48FPS, 0, Cine-Scope 24fps 2048x858, },
+ {5, CINE_SCOPE_48FPS, 0, Cine-Scope 48fps 2048x858, },
+ {6, CINE_FLAT_24FPS, 0, Cine-Flat 24fps 1998x1080, },
+ {7, CINE_FLAT_48FPS, 0, Cine-Flat 48fps 1998x1080, },
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem jp2_depth_items[] = {
- {0, 8, 0, 8, },
- {R_JPEG2K_12BIT, 16, 0, 16, },
- {R_JPEG2K_16BIT, 32, 0, 32, },
+ {8, 8, 0, 8, 8 bit color channels},
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23527] trunk/blender/source/blender/ editors: File Browser fixes:
Revision: 23527
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23527
Author: blendix
Date: 2009-09-28 14:10:23 +0200 (Mon, 28 Sep 2009)
Log Message:
---
File Browser fixes:
* The code to draw only visible items was not working, giving slow
performance with many files (bug #19469).
* Fix detailed list display on non-windows, would give overlapping text.
* Fix folders with many files not displaying all items, changed short to
int in various places, was overflowing.
* Recreate layout on area resizes, file view gets out of sync otherwise.
* Workaround for v2d height not being correct with image display due to
scrollers.
* Fix view2d code to compute minimum scroller size, this would make the
scroller go outside of its bounds.
Modified Paths:
--
trunk/blender/source/blender/editors/include/ED_fileselect.h
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_file/space_file.c
Modified: trunk/blender/source/blender/editors/include/ED_fileselect.h
===
--- trunk/blender/source/blender/editors/include/ED_fileselect.h
2009-09-28 12:10:13 UTC (rev 23526)
+++ trunk/blender/source/blender/editors/include/ED_fileselect.h
2009-09-28 12:10:23 UTC (rev 23527)
@@ -51,21 +51,21 @@
typedef struct FileLayout
{
/* view settings - XXX - move into own struct */
- short prv_w;
- short prv_h;
- short tile_w;
- short tile_h;
- short tile_border_x;
- short tile_border_y;
- short prv_border_x;
- short prv_border_y;
- short rows;
- short columns;
- short width;
- short height;
- short flag;
- short dirty;
- short textheight;
+ int prv_w;
+ int prv_h;
+ int tile_w;
+ int tile_h;
+ int tile_border_x;
+ int tile_border_y;
+ int prv_border_x;
+ int prv_border_y;
+ int rows;
+ int columns;
+ int width;
+ int height;
+ int flag;
+ int dirty;
+ int textheight;
float column_widths[MAX_FILE_COLUMN];
} FileLayout;
@@ -84,7 +84,7 @@
int ED_fileselect_layout_numfiles(FileLayout* layout, struct ARegion *ar);
int ED_fileselect_layout_offset(FileLayout* layout, int x, int y);
-void ED_fileselect_layout_tilepos(FileLayout* layout, int tile, short *x,
short *y);
+void ED_fileselect_layout_tilepos(FileLayout* layout, int tile, int *x, int
*y);
#endif /* ED_FILES_H */
Modified: trunk/blender/source/blender/editors/interface/view2d.c
===
--- trunk/blender/source/blender/editors/interface/view2d.c 2009-09-28
12:10:13 UTC (rev 23526)
+++ trunk/blender/source/blender/editors/interface/view2d.c 2009-09-28
12:10:23 UTC (rev 23527)
@@ -831,6 +831,7 @@
height= abs(height);
/* hrumf! */
+ /* XXX: there are work arounds for this in the panel and file browse
code. */
if(scroll V2D_SCROLL_HORIZONTAL)
width -= V2D_SCROLL_WIDTH;
if(scroll V2D_SCROLL_VERTICAL)
@@ -1397,8 +1398,14 @@
if (scrollers-hor_min scrollers-hor_max)
scrollers-hor_min= scrollers-hor_max;
/* prevent sliders from being too small, and disappearing */
- if ((scrollers-hor_max - scrollers-hor_min)
V2D_SCROLLER_HANDLE_SIZE)
- scrollers-hor_max+= V2D_SCROLLER_HANDLE_SIZE;
+ if ((scrollers-hor_max - scrollers-hor_min)
V2D_SCROLLER_HANDLE_SIZE) {
+ scrollers-hor_max= scrollers-hor_min +
V2D_SCROLLER_HANDLE_SIZE;
+
+ if(scrollers-hor_max hor.xmax) {
+ scrollers-hor_max= hor.xmax;
+ scrollers-hor_min= MAX2(scrollers-hor_max -
V2D_SCROLLER_HANDLE_SIZE, hor.xmin);
+ }
+ }
/* check whether sliders can disappear */
if(v2d-keeptot) {
@@ -1429,8 +1436,14 @@
if (scrollers-vert_min scrollers-vert_max)
scrollers-vert_min= scrollers-vert_max;
/* prevent sliders from being too small, and disappearing */
- if ((scrollers-vert_max - scrollers-vert_min)
V2D_SCROLLER_HANDLE_SIZE)
- scrollers-vert_max+= V2D_SCROLLER_HANDLE_SIZE;
+ if ((scrollers-vert_max - scrollers-vert_min)
V2D_SCROLLER_HANDLE_SIZE) {
+ scrollers-vert_max= scrollers-vert_min +
V2D_SCROLLER_HANDLE_SIZE;
+
+ if(scrollers-vert_max vert.ymax) {
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23528] trunk/blender/source/blender: add temp defines to keep the game engine building, should be fixed properly.
Revision: 23528 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23528 Author: campbellbarton Date: 2009-09-28 14:20:56 +0200 (Mon, 28 Sep 2009) Log Message: --- add temp defines to keep the game engine building, should be fixed properly. fix implicit declaration too. Modified Paths: -- trunk/blender/source/blender/makesdna/DNA_action_types.h trunk/blender/source/blender/makesrna/intern/rna_pose.c Modified: trunk/blender/source/blender/makesdna/DNA_action_types.h === --- trunk/blender/source/blender/makesdna/DNA_action_types.h2009-09-28 12:10:23 UTC (rev 23527) +++ trunk/blender/source/blender/makesdna/DNA_action_types.h2009-09-28 12:20:56 UTC (rev 23528) @@ -553,5 +553,13 @@ ACHAN_MOVED = (131), } ACHAN_FLAG; +// XXX Incorrect, Temp for building +#define PCHAN_ROT_QUAT -1 +#define PCHAN_ROT_XYZ -1 +#define PCHAN_ROT_XZY -1 +#define PCHAN_ROT_YXZ -1 +#define PCHAN_ROT_YZX -1 +#define PCHAN_ROT_ZXY -1 +#define PCHAN_ROT_ZYX -1 #endif Modified: trunk/blender/source/blender/makesrna/intern/rna_pose.c === --- trunk/blender/source/blender/makesrna/intern/rna_pose.c 2009-09-28 12:10:23 UTC (rev 23527) +++ trunk/blender/source/blender/makesrna/intern/rna_pose.c 2009-09-28 12:20:56 UTC (rev 23528) @@ -42,6 +42,7 @@ #include BIK_api.h #include BKE_action.h +#include BKE_armature.h #include BLI_arithb.h #include DNA_userdef_types.h ___ 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 [23529] trunk/blender/source/blender/ editors: missing Del key in the keymaps where Xkey was used
Revision: 23529 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23529 Author: campbellbarton Date: 2009-09-28 14:33:52 +0200 (Mon, 28 Sep 2009) Log Message: --- missing Del key in the keymaps where Xkey was used Modified Paths: -- trunk/blender/source/blender/editors/animation/anim_markers.c trunk/blender/source/blender/editors/armature/armature_ops.c trunk/blender/source/blender/editors/mesh/mesh_ops.c trunk/blender/source/blender/editors/space_file/space_file.c Modified: trunk/blender/source/blender/editors/animation/anim_markers.c === --- trunk/blender/source/blender/editors/animation/anim_markers.c 2009-09-28 12:20:56 UTC (rev 23528) +++ trunk/blender/source/blender/editors/animation/anim_markers.c 2009-09-28 12:33:52 UTC (rev 23529) @@ -1002,6 +1002,7 @@ WM_keymap_verify_item(keymap, MARKER_OT_select_border, BKEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, MARKER_OT_select_all_toggle, AKEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, MARKER_OT_delete, XKEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, MARKER_OT_delete, DELKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, MARKER_OT_move, GKEY, KM_PRESS, 0, 0); Modified: trunk/blender/source/blender/editors/armature/armature_ops.c === --- trunk/blender/source/blender/editors/armature/armature_ops.c 2009-09-28 12:20:56 UTC (rev 23528) +++ trunk/blender/source/blender/editors/armature/armature_ops.c 2009-09-28 12:33:52 UTC (rev 23529) @@ -248,6 +248,7 @@ WM_keymap_add_item(keymap, ARMATURE_OT_select_linked, LKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, ARMATURE_OT_delete, XKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, ARMATURE_OT_delete, DELKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, ARMATURE_OT_duplicate, DKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, ARMATURE_OT_extrude, EKEY, KM_PRESS, 0, 0); kmi= WM_keymap_add_item(keymap, ARMATURE_OT_extrude, EKEY, KM_PRESS, KM_SHIFT, 0); @@ -280,6 +281,7 @@ /* Armature - Etch-A-Ton */ WM_keymap_add_item(keymap, SKETCH_OT_delete, XKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, SKETCH_OT_delete, DELKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, SKETCH_OT_finish_stroke, SELECTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, SKETCH_OT_cancel_stroke, ESCKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, SKETCH_OT_select, SELECTMOUSE, KM_PRESS, 0, 0); Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c === --- trunk/blender/source/blender/editors/mesh/mesh_ops.c2009-09-28 12:20:56 UTC (rev 23528) +++ trunk/blender/source/blender/editors/mesh/mesh_ops.c2009-09-28 12:33:52 UTC (rev 23529) @@ -434,6 +434,7 @@ WM_keymap_add_item(keymap, MESH_OT_dupli_extrude_cursor, LEFTMOUSE, KM_RELEASE, KM_CTRL, 0); WM_keymap_add_item(keymap, MESH_OT_delete, XKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, MESH_OT_delete, DELKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, MESH_OT_fgon_make, FKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, MESH_OT_fgon_clear, FKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0); Modified: trunk/blender/source/blender/editors/space_file/space_file.c === --- trunk/blender/source/blender/editors/space_file/space_file.c 2009-09-28 12:20:56 UTC (rev 23528) +++ trunk/blender/source/blender/editors/space_file/space_file.c 2009-09-28 12:33:52 UTC (rev 23529) @@ -377,6 +377,7 @@ WM_keymap_add_item(keymap, FILE_OT_next, BACKSPACEKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, FILE_OT_directory_new, IKEY, KM_PRESS, 0, 0); /* XXX needs button */ WM_keymap_add_item(keymap, FILE_OT_delete, XKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, FILE_OT_delete, DELKEY, KM_PRESS, 0, 0); /* keys for main area */ keymap= WM_keymap_find(wm, FileMain, SPACE_FILE, 0); ___ 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 [23531] trunk/blender/source/blender: RNA
Revision: 23531 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23531 Author: blendix Date: 2009-09-28 16:28:45 +0200 (Mon, 28 Sep 2009) Log Message: --- RNA * Move mesh API functions to mesh_data.c, would like to keep RNA layer fairly thin, any non-trivial functions shoud be in their modules. * Replace mesh.create_copy by generic id.copy. * Fix #19250: Mesh.add_geometry() in editmode fails silently, now gives an error. Modified Paths: -- trunk/blender/source/blender/editors/include/ED_mesh.h trunk/blender/source/blender/makesrna/intern/rna_ID.c trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c Added Paths: --- trunk/blender/source/blender/editors/mesh/mesh_data.c Removed Paths: - trunk/blender/source/blender/editors/mesh/mesh_layers.c Modified: trunk/blender/source/blender/editors/include/ED_mesh.h === --- trunk/blender/source/blender/editors/include/ED_mesh.h 2009-09-28 13:05:03 UTC (rev 23530) +++ trunk/blender/source/blender/editors/include/ED_mesh.h 2009-09-28 14:28:45 UTC (rev 23531) @@ -38,6 +38,7 @@ struct bContext; struct wmOperator; struct wmWindowManager; +struct ReportList; struct EditSelection; struct ViewContext; struct bDeformGroup; @@ -49,6 +50,8 @@ struct UvVertMap; struct UvMapVert; struct CustomData; +struct Material; +struct Object; #define EM_FGON_DRAW 1 // face flag #define EM_FGON2 // edge and face flag both @@ -89,9 +92,9 @@ void ED_spacetypes_init(void); void ED_keymap_mesh(struct wmWindowManager *wm); -void make_editMesh(struct Scene *scene, Object *ob); -void load_editMesh(struct Scene *scene, Object *ob); -void remake_editMesh(struct Scene *scene, Object *ob); +void make_editMesh(struct Scene *scene, struct Object *ob); +void load_editMesh(struct Scene *scene, struct Object *ob); +void remake_editMesh(struct Scene *scene, struct Object *ob); void free_editMesh(struct EditMesh *em); void recalc_editnormals(struct EditMesh *em); @@ -184,5 +187,18 @@ int editface_containsEdge(struct EditFace *efa, struct EditEdge *eed); short sharesFace(struct EditMesh *em, struct EditEdge *e1, struct EditEdge *e2); +/* mesh_data.c */ + +void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int verts, int edges, int faces); +void ED_mesh_transform(struct Mesh *me, float *mat); +void ED_mesh_calc_normals(struct Mesh *me); +void ED_mesh_material_add(struct Mesh *me, struct Material *ma); +void ED_mesh_update(struct Mesh *mesh, struct bContext *C); + +int ED_mesh_uv_texture_add(struct bContext *C, struct Scene *scene, struct Object *ob, struct Mesh *me); +int ED_mesh_uv_texture_remove(struct bContext *C, struct Object *ob, struct Mesh *me); +int ED_mesh_color_add(struct bContext *C, struct Scene *scene, struct Object *ob, struct Mesh *me); +int ED_mesh_color_remove(struct bContext *C, struct Object *ob, struct Mesh *me); + #endif /* ED_MESH_H */ Copied: trunk/blender/source/blender/editors/mesh/mesh_data.c (from rev 23529, trunk/blender/source/blender/editors/mesh/mesh_layers.c) === --- trunk/blender/source/blender/editors/mesh/mesh_data.c (rev 0) +++ trunk/blender/source/blender/editors/mesh/mesh_data.c 2009-09-28 14:28:45 UTC (rev 23531) @@ -0,0 +1,667 @@ +/** + * $Id$ + * + * * BEGIN GPL LICENSE BLOCK * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2009 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * * END GPL LICENSE BLOCK * + */ + +#include math.h +#include stdlib.h +#include string.h + +#include MEM_guardedalloc.h + +#include DNA_customdata_types.h +#include DNA_material_types.h +#include DNA_mesh_types.h +#include DNA_meshdata_types.h +#include DNA_object_types.h +#include DNA_scene_types.h +#include DNA_windowmanager_types.h + +#include BKE_context.h +#include BKE_customdata.h +#include BKE_depsgraph.h +#include
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23532] trunk/blender/source/blender/ editors/space_outliner/outliner.c: Fix #19351: items in outliner disappear prematurely.
Revision: 23532
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23532
Author: blendix
Date: 2009-09-28 16:33:38 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19351: items in outliner disappear prematurely. Note icons
still disappear too soon, but this is an issue in the icon system,
same happens on all buttons, will have a fix for this later.
Modified Paths:
--
trunk/blender/source/blender/editors/space_outliner/outliner.c
Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===
--- trunk/blender/source/blender/editors/space_outliner/outliner.c
2009-09-28 14:28:45 UTC (rev 23531)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c
2009-09-28 14:33:38 UTC (rev 23532)
@@ -4324,7 +4324,7 @@
tselem= TREESTORE(te);
- if(*starty = ar-v2d.cur.ymin *starty= ar-v2d.cur.ymax) {
+ if(*starty+2*OL_H = ar-v2d.cur.ymin *starty= ar-v2d.cur.ymax) {
glEnable(GL_BLEND);
@@ -4579,7 +4579,7 @@
ystart= (int)ar-v2d.tot.ymax;
ystart= OL_H*(ystart/(OL_H));
- while(ystart ar-v2d.cur.ymin) {
+ while(ystart+2*OL_H ar-v2d.cur.ymin) {
glRecti(0, ystart, (int)ar-v2d.cur.xmax, ystart+OL_H);
ystart-= 2*OL_H;
}
@@ -4597,7 +4597,7 @@
ystart= (int)ar-v2d.tot.ymax;
ystart= OL_H*(ystart/(OL_H));
- while(ystart ar-v2d.cur.ymin) {
+ while(ystart+2*OL_H ar-v2d.cur.ymin) {
glRecti((int)ar-v2d.cur.xmax-OL_TOGW, ystart,
(int)ar-v2d.cur.xmax, ystart+OL_H);
ystart-= 2*OL_H;
}
@@ -4812,7 +4812,7 @@
for(te= lb-first; te; te= te-next) {
tselem= TREESTORE(te);
- if(te-ys = ar-v2d.cur.ymin te-ys = ar-v2d.cur.ymax) {
+ if(te-ys+2*OL_H = ar-v2d.cur.ymin te-ys =
ar-v2d.cur.ymax) {
/* objects have toggle-able restriction flags */
if(tselem-type==0 te-idcode==ID_OB) {
ob = (Object *)tselem-id;
@@ -4924,7 +4924,7 @@
for(te= lb-first; te; te= te-next) {
tselem= TREESTORE(te);
- if(te-ys = ar-v2d.cur.ymin te-ys = ar-v2d.cur.ymax) {
+ if(te-ys+2*OL_H = ar-v2d.cur.ymin te-ys =
ar-v2d.cur.ymax) {
if(tselem-type == TSE_RNA_PROPERTY) {
ptr= te-rnaptr;
prop= te-directdata;
@@ -5139,7 +5139,7 @@
for(te= lb-first; te; te= te-next) {
tselem= TREESTORE(te);
- if(te-ys = ar-v2d.cur.ymin te-ys = ar-v2d.cur.ymax) {
+ if(te-ys+2*OL_H = ar-v2d.cur.ymin te-ys =
ar-v2d.cur.ymax) {
uiBut *but;
char *str;
int xstart= 240;
@@ -5217,7 +5217,7 @@
for(te= lb-first; te; te= te-next) {
tselem= TREESTORE(te);
- if(te-ys = ar-v2d.cur.ymin te-ys = ar-v2d.cur.ymax) {
+ if(te-ys+2*OL_H = ar-v2d.cur.ymin te-ys =
ar-v2d.cur.ymax) {
if(tselem-flag TSE_TEXTBUT) {
___
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 [23533] trunk/blender/source/blender/ editors/object/object_edit.c: Fix #19453: rendering with mesh in edit mode would put the object
Revision: 23533
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23533
Author: blendix
Date: 2009-09-28 16:40:37 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19453: rendering with mesh in edit mode would put the object
partially back in object mode, disabling e.g. X delete.
Modified Paths:
--
trunk/blender/source/blender/editors/object/object_edit.c
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===
--- trunk/blender/source/blender/editors/object/object_edit.c 2009-09-28
14:33:38 UTC (rev 23532)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2009-09-28
14:40:37 UTC (rev 23533)
@@ -332,7 +332,7 @@
if(freedata) free_editMball(obedit);
}
- /* freedata only 0 now on file saves */
+ /* freedata only 0 now on file saves and render */
if(freedata) {
ListBase pidlist;
PTCacheID *pid;
@@ -357,10 +357,10 @@
if(flag EM_WAITCURSOR) waitcursor(0);
WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT,
scene);
+
+ obedit-mode = ~OB_MODE_EDIT;
+ ED_object_toggle_modes(C, obedit-restore_mode);
}
-
- obedit-mode = ~OB_MODE_EDIT;
- ED_object_toggle_modes(C, obedit-restore_mode);
}
___
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 [23534] trunk/blender/source/blender/ editors/transform: Fix #19468: particle mode crash in transform, when there are
Revision: 23534
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23534
Author: blendix
Date: 2009-09-28 16:51:42 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19468: particle mode crash in transform, when there are
no editable particles.
Modified Paths:
--
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2009-09-28 14:40:37 UTC (rev 23533)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2009-09-28 14:51:42 UTC (rev 23534)
@@ -4825,7 +4825,7 @@
// allqueue(REDRAWBUTSEDIT, 0);
}
- else if(t-scene-basact (ob = t-scene-basact-object) ob-mode
OB_MODE_PARTICLE_EDIT) {
+ else if(t-scene-basact (ob = t-scene-basact-object)
(ob-mode OB_MODE_PARTICLE_EDIT) PE_get_current(t-scene, ob)) {
;
}
else {
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===
--- trunk/blender/source/blender/editors/transform/transform_generics.c
2009-09-28 14:40:37 UTC (rev 23533)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c
2009-09-28 14:51:42 UTC (rev 23534)
@@ -92,6 +92,7 @@
#include ED_markers.h
#include ED_mesh.h
#include ED_retopo.h
+#include ED_particle.h
#include ED_screen_types.h
#include ED_space_api.h
#include ED_uvedit.h
@@ -346,7 +347,7 @@
if (t-obedit) {
}
- else if(base base-object-mode OB_MODE_PARTICLE_EDIT) {
+ else if(base (base-object-mode OB_MODE_PARTICLE_EDIT)
PE_get_current(scene, base-object)) {
flushTransParticles(t);
}
if (t-spacetype==SPACE_NODE) {
___
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 [23535] trunk/blender/source/blender/ editors/transform/transform_manipulator.c: Fix #19477: transform manipulator did not work correct with
Revision: 23535
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23535
Author: blendix
Date: 2009-09-28 17:14:52 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19477: transform manipulator did not work correct with
quad view, got wrong context.
Modified Paths:
--
trunk/blender/source/blender/editors/transform/transform_manipulator.c
Modified: trunk/blender/source/blender/editors/transform/transform_manipulator.c
===
--- trunk/blender/source/blender/editors/transform/transform_manipulator.c
2009-09-28 14:51:42 UTC (rev 23534)
+++ trunk/blender/source/blender/editors/transform/transform_manipulator.c
2009-09-28 15:14:52 UTC (rev 23535)
@@ -1602,7 +1602,7 @@
break;
}
RNA_boolean_set_array(op-ptr, constraint_axis,
constraint_axis);
- WM_operator_name_call(C, TFM_OT_translate,
WM_OP_INVOKE_REGION_WIN, op-ptr);
+ WM_operator_name_call(C, TFM_OT_translate,
WM_OP_INVOKE_DEFAULT, op-ptr);
}
else if (drawflags MAN_SCALE_C) {
switch(drawflags) {
@@ -1632,10 +1632,10 @@
break;
}
RNA_boolean_set_array(op-ptr, constraint_axis,
constraint_axis);
- WM_operator_name_call(C, TFM_OT_resize,
WM_OP_INVOKE_REGION_WIN, op-ptr);
+ WM_operator_name_call(C, TFM_OT_resize,
WM_OP_INVOKE_DEFAULT, op-ptr);
}
else if (drawflags == MAN_ROT_T) { /* trackball need special
case, init is different */
- WM_operator_name_call(C, TFM_OT_trackball,
WM_OP_INVOKE_REGION_WIN, op-ptr);
+ WM_operator_name_call(C, TFM_OT_trackball,
WM_OP_INVOKE_DEFAULT, op-ptr);
}
else if (drawflags MAN_ROT_C) {
switch(drawflags) {
@@ -1650,7 +1650,7 @@
break;
}
RNA_boolean_set_array(op-ptr, constraint_axis,
constraint_axis);
- WM_operator_name_call(C, TFM_OT_rotate,
WM_OP_INVOKE_REGION_WIN, op-ptr);
+ WM_operator_name_call(C, TFM_OT_rotate,
WM_OP_INVOKE_DEFAULT, op-ptr);
}
}
/* after transform, restore drawflags */
___
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 [23536] trunk/blender/source/blender/ windowmanager/intern/wm_files.c: Fix #19479: ctrl+N could temporarily freeze the window when user
Revision: 23536
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23536
Author: blendix
Date: 2009-09-28 17:34:15 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19479: ctrl+N could temporarily freeze the window when user
preferences were saved from a separate window. Missing transfor of
active window state to the new window.
Modified Paths:
--
trunk/blender/source/blender/windowmanager/intern/wm_files.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c
2009-09-28 15:14:52 UTC (rev 23535)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c
2009-09-28 15:34:15 UTC (rev 23536)
@@ -195,6 +195,7 @@
/* ensure making new keymaps and set space types */
wm-initialized= 0;
+ wm-winactive= NULL;
/* only first wm in list has ghostwins */
for(win= wm-windows.first; win; win= win-next) {
@@ -202,6 +203,10 @@
if(oldwin-winid == win-winid ) {
win-ghostwin= oldwin-ghostwin;
+ win-active= oldwin-active;
+ if(win-active)
+ wm-winactive= win;
+
GHOST_SetWindowUserData(win-ghostwin, win);/* pointer back */
oldwin-ghostwin= NULL;
___
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 [23537] trunk/blender/source/blender/ blenlib/intern/util.c: File paths: use release/ for scripts if possible again, this got
Revision: 23537 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23537 Author: blendix Date: 2009-09-28 17:47:05 +0200 (Mon, 28 Sep 2009) Log Message: --- File paths: use release/ for scripts if possible again, this got changed with the file path changes, the reason to check this first is that it allows to edit py scripts without having to run the build system for each change. Modified Paths: -- trunk/blender/source/blender/blenlib/intern/util.c Modified: trunk/blender/source/blender/blenlib/intern/util.c === --- trunk/blender/source/blender/blenlib/intern/util.c 2009-09-28 15:34:15 UTC (rev 23536) +++ trunk/blender/source/blender/blenlib/intern/util.c 2009-09-28 15:47:05 UTC (rev 23537) @@ -902,16 +902,16 @@ s = BLI_last_slash(bprogname); i = s - bprogname + 1; BLI_strncpy(bprogdir, bprogname, i); - - /* try ./.blender/folder_name */ - if(test_data_path(targetpath, bprogdir, .blender, folder_name)) + + /* try release/folder_name (CWD relative) */ + if(test_data_path(targetpath, BLI_getwdN(cwd), release, folder_name)) return 1; - + if(test_data_path(targetpath, bprogdir, release, folder_name)) return 1; - - /* try release/folder_name (CWD relative) */ - if(test_data_path(targetpath, BLI_getwdN(cwd), release, folder_name)) + + /* try ./.blender/folder_name */ + if(test_data_path(targetpath, bprogdir, .blender, folder_name)) return 1; return 0; ___ 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 [23538] trunk/blender: * Copy() - Clone() (even though these hopefully will be obliterated from extern/ soon)
Revision: 23538
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23538
Author: jesterking
Date: 2009-09-28 17:49:26 +0200 (Mon, 28 Sep 2009)
Log Message:
---
* Copy() - Clone() (even though these hopefully will be obliterated from
extern/ soon)
* remove reference to docs SConscript
* python dbg commit - somehow this one was left uncommitted when I was working
on r23465 and r23464
Modified Paths:
--
trunk/blender/SConstruct
trunk/blender/extern/ffmpeg/SConscript
trunk/blender/extern/x264/SConscript
trunk/blender/extern/xvidcore/SConscript
trunk/blender/source/gameengine/Converter/SConscript
Modified: trunk/blender/SConstruct
===
--- trunk/blender/SConstruct2009-09-28 15:47:05 UTC (rev 23537)
+++ trunk/blender/SConstruct2009-09-28 15:49:26 UTC (rev 23538)
@@ -643,7 +643,6 @@
except: epydoc = None
if epydoc:
- SConscript('source/blender/python/api2_2x/doc/SConscript')
SConscript('source/gameengine/PyDoc/SConscript')
else:
print No epydoc install detected, Python API and Gameengine
API Docs will not be generated
Modified: trunk/blender/extern/ffmpeg/SConscript
===
--- trunk/blender/extern/ffmpeg/SConscript 2009-09-28 15:47:05 UTC (rev
23537)
+++ trunk/blender/extern/ffmpeg/SConscript 2009-09-28 15:49:26 UTC (rev
23538)
@@ -28,7 +28,7 @@
from sets import Set
-ff_env = env.Copy();
+ff_env = env.Clone()
ff_env.Replace(CCFLAGS = '')
ff_env.Replace(BF_DEBUG_FLAGS = '')
Modified: trunk/blender/extern/x264/SConscript
===
--- trunk/blender/extern/x264/SConscript2009-09-28 15:47:05 UTC (rev
23537)
+++ trunk/blender/extern/x264/SConscript2009-09-28 15:49:26 UTC (rev
23538)
@@ -11,7 +11,7 @@
from sets import Set
-x264_env = env.Copy();
+x264_env = env.Clone()
x264_env.Replace(CCFLAGS = '')
x264_env.Replace(BF_DEBUG_FLAGS = '')
Modified: trunk/blender/extern/xvidcore/SConscript
===
--- trunk/blender/extern/xvidcore/SConscript2009-09-28 15:47:05 UTC (rev
23537)
+++ trunk/blender/extern/xvidcore/SConscript2009-09-28 15:49:26 UTC (rev
23538)
@@ -16,7 +16,7 @@
from sets import Set
-xvidcore_env = env.Copy();
+xvidcore_env = env.Clone()
xvidcore_env.Replace(CCFLAGS = '')
xvidcore_env.Replace(BF_DEBUG_FLAGS = '')
Modified: trunk/blender/source/gameengine/Converter/SConscript
===
--- trunk/blender/source/gameengine/Converter/SConscript2009-09-28
15:47:05 UTC (rev 23537)
+++ trunk/blender/source/gameengine/Converter/SConscript2009-09-28
15:49:26 UTC (rev 23538)
@@ -13,7 +13,7 @@
incs += ' #source/blender/editors/include #source/blender/makesdna
#source/gameengine/Rasterizer'
incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer
#source/gameengine/GameLogic'
incs += ' #source/gameengine/Expressions #source/gameengine/Network
#source/gameengine/SceneGraph'
-incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet
#source/gameengine/Physics/BlOde'
+incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet'
incs += ' #source/gameengine/Physics/Dummy'
incs += ' #source/gameengine/Network/LoopBackNetwork'
incs += ' #source/blender/misc #source/blender/blenloader #source/blender/gpu'
@@ -24,4 +24,8 @@
incs += ' ' + env['BF_PYTHON_INC']
incs += ' ' + env['BF_BULLET_INC']
+if env['BF_DEBUG']:
+ if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc', 'win64-vc'):
+ defs.append('_DEBUG')
+
env.BlenderLib ( 'bf_converter', sources, Split(incs), defs,
libtype=['core','player'], priority=[305,40],
cxx_compileflags=env['BGE_CXXFLAGS'])
___
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 [23539] trunk/blender/source/blender/ editors: Fix drawing of MENU buttons with only an icon, was not aligned right
Revision: 23539
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23539
Author: blendix
Date: 2009-09-28 17:59:09 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix drawing of MENU buttons with only an icon, was not aligned right
and showing unneeded triangles (+ buttons in Boids Brain).
Modified Paths:
--
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===
--- trunk/blender/source/blender/editors/include/UI_interface.h 2009-09-28
15:49:26 UTC (rev 23538)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2009-09-28
15:59:09 UTC (rev 23539)
@@ -424,6 +424,7 @@
uiBut *uiDefPulldownBut(uiBlock *block, uiBlockCreateFunc func, void *arg,
char *str, short x1, short y1, short x2, short y2, char *tip);
uiBut *uiDefMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, char
*str, short x1, short y1, short x2, short y2, char *tip);
uiBut *uiDefIconTextMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg,
int icon, char *str, short x1, short y1, short x2, short y2, char *tip);
+uiBut *uiDefIconMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, int
icon, short x1, short y1, short x2, short y2, char *tip);
uiBut *uiDefBlockBut(uiBlock *block, uiBlockCreateFunc func, void *func_arg1,
char *str, short x1, short y1, short x2, short y2, char *tip);
uiBut *uiDefBlockButN(uiBlock *block, uiBlockCreateFunc func, void *argN, char
*str, short x1, short y1, short x2, short y2, char *tip);
Modified: trunk/blender/source/blender/editors/interface/interface.c
===
--- trunk/blender/source/blender/editors/interface/interface.c 2009-09-28
15:49:26 UTC (rev 23538)
+++ trunk/blender/source/blender/editors/interface/interface.c 2009-09-28
15:59:09 UTC (rev 23539)
@@ -3064,6 +3064,20 @@
return but;
}
+uiBut *uiDefIconMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, int
icon, short x1, short y1, short x2, short y2, char *tip)
+{
+ uiBut *but= ui_def_but(block, PULLDOWN, 0, , x1, y1, x2, y2, arg,
0.0, 0.0, 0.0, 0.0, tip);
+
+ but-icon= (BIFIconID) icon;
+ but-flag |= UI_HAS_ICON;
+ but-flag =~ UI_ICON_LEFT;
+
+ but-menu_create_func= func;
+ ui_check_but(but);
+
+ return but;
+}
+
/* Block button containing both string label and icon */
uiBut *uiDefIconTextBlockBut(uiBlock *block, uiBlockCreateFunc func, void
*arg, int icon, char *str, short x1, short y1, short x2, short y2, char *tip)
{
Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===
--- trunk/blender/source/blender/editors/interface/interface_intern.h
2009-09-28 15:49:26 UTC (rev 23538)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h
2009-09-28 15:59:09 UTC (rev 23539)
@@ -72,6 +72,7 @@
/* menus */
UI_WTYPE_MENU_RADIO,
+ UI_WTYPE_MENU_ICON_RADIO,
UI_WTYPE_MENU_POINTER_LINK,
UI_WTYPE_PULLDOWN,
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===
--- trunk/blender/source/blender/editors/interface/interface_layout.c
2009-09-28 15:49:26 UTC (rev 23538)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c
2009-09-28 15:59:09 UTC (rev 23539)
@@ -1183,8 +1183,10 @@
if(layout-root-type == UI_LAYOUT_HEADER) /* ugly .. */
w -= 10;
- if(icon)
+ if(name[0] icon)
but= uiDefIconTextMenuBut(block, func, arg, icon, (char*)name,
0, 0, w, h, );
+ else if(icon)
+ but= uiDefIconMenuBut(block, func, arg, icon, 0, 0, w, h, );
else
but= uiDefMenuBut(block, func, arg, (char*)name, 0, 0, w, h,
);
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-28 15:49:26 UTC (rev 23538)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-28 15:59:09 UTC (rev 23539)
@@ -1973,7 +1973,19 @@
/* text space */
rect-xmax -= (rect-ymax-rect-ymin);
+}
+
+static void widget_menuiconbut(uiWidgetColors *wcol, rcti *rect, int state,
int roundboxalign)
+{
+ uiWidgetBase wtb;
+ widget_init(wtb);
+
+ /* half rounded */
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23540] trunk/blender/source/blender/ blenlib/intern/dynlib.c: Fix compile problem on OS X Snow Leopard.
Revision: 23540
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23540
Author: blendix
Date: 2009-09-28 18:05:34 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix compile problem on OS X Snow Leopard. The Mac code for dynamic
library loading was using some non-public OS X functions, which give
linking issues for me. Since OS X 10.3 standard unix dlopen() is
supported, so I just removed this code, we don't support earlier
versions anyway.
Modified Paths:
--
trunk/blender/source/blender/blenlib/intern/dynlib.c
Modified: trunk/blender/source/blender/blenlib/intern/dynlib.c
===
--- trunk/blender/source/blender/blenlib/intern/dynlib.c2009-09-28
15:59:09 UTC (rev 23539)
+++ trunk/blender/source/blender/blenlib/intern/dynlib.c2009-09-28
16:05:34 UTC (rev 23540)
@@ -23,8 +23,6 @@
* The Original Code is: all of this file, with exception of below:
*
* Contributor(s): Peter O'Gorman
- * The functions osxdlopen() and osxerror()
- * are Copyright (c) 2002 Peter O'Gorman ogor...@users.sourceforge.net
*
* * END GPL LICENSE BLOCK *
*/
@@ -102,202 +100,6 @@
free(lib);
}
-#else
-#ifdef __APPLE__ /* MacOS X */
-
-#include mach-o/dyld.h
-#include dlfcn.h
-#include stdarg.h
-
-#define ERR_STR_LEN 256
-
-struct PILdynlib {
- void *handle;
-};
-
-static char *osxerror(int setget, const char *str, ...)
-{
- static char errstr[ERR_STR_LEN];
- static int err_filled = 0;
- char *retval;
- NSLinkEditErrors ler;
- int lerno;
- const char *dylderrstr;
- const char *file;
- va_list arg;
- if (setget = 0)
- {
- va_start(arg, str);
- strncpy(errstr, dlsimple: , ERR_STR_LEN);
- vsnprintf(errstr + 10, ERR_STR_LEN - 10, str, arg);
- va_end(arg);
- /* We prefer to use the dyld error string if setget is 0 */
- if (setget == 0) {
- NSLinkEditError(ler, lerno, file, dylderrstr);
-// printf(dyld: %s\n,dylderrstr);
- if (dylderrstr strlen(dylderrstr))
- strncpy(errstr,dylderrstr,ERR_STR_LEN);
- }
- err_filled = 1;
- retval = NULL;
- }
- else
- {
- if (!err_filled)
- retval = NULL;
- else
- retval = errstr;
- err_filled = 0;
- }
- return retval;
-}
-
-static void *osxdlopen(const char *path, int mode)
-{
- void *module = 0;
- NSObjectFileImage ofi = 0;
- NSObjectFileImageReturnCode ofirc;
- static int (*make_private_module_public) (NSModule module) = 0;
- unsigned int flags = NSLINKMODULE_OPTION_RETURN_ON_ERROR |
NSLINKMODULE_OPTION_PRIVATE;
-
- /* If we got no path, the app wants the global namespace, use -1 as the
marker
- in this case */
- if (!path)
- return (void *)-1;
-
- /* Create the object file image, works for things linked with the
-bundle arg to ld */
- ofirc = NSCreateObjectFileImageFromFile(path, ofi);
- switch (ofirc)
- {
- case NSObjectFileImageSuccess:
- /* It was okay, so use NSLinkModule to link in the
image */
- if (!(mode RTLD_LAZY)) flags +=
NSLINKMODULE_OPTION_BINDNOW;
- module = NSLinkModule(ofi, path,flags);
- /* Don't forget to destroy the object file image,
unless you like leaks */
- NSDestroyObjectFileImage(ofi);
- /* If the mode was global, then change the module, this
avoids
- multiply defined symbol errors to first load private
then make
- global. Silly, isn't it. */
- if ((mode RTLD_GLOBAL))
- {
- if (!make_private_module_public)
- {
-
_dyld_func_lookup(__dyld_NSMakePrivateModulePublic,
- (unsigned long *)make_private_module_public);
- }
- make_private_module_public(module);
- }
- break;
- case NSObjectFileImageInappropriateFile:
- /* It may have been a dynamic library rather than a
bundle, try to load it */
- module = (void *)NSAddImage(path,
NSADDIMAGE_OPTION_RETURN_ON_ERROR);
- break;
- case NSObjectFileImageFailure:
- osxerror(0,Object file setup failure : \%s\, path);
- return 0;
- case NSObjectFileImageArch:
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23541] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: Fix potential crash for file operators that don't define
Revision: 23541
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23541
Author: blendix
Date: 2009-09-28 18:11:06 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix potential crash for file operators that don't define
a path property, now it will just give a warning.
Modified Paths:
--
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-09-28 16:05:34 UTC (rev 23540)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-09-28 16:11:06 UTC (rev 23541)
@@ -943,7 +943,7 @@
/* XXX also extension code in
image-save doesnt work for this yet */
if(strncmp(handler-op-type-name,
Save, 4)==0) {
/* this gives ownership to
pupmenu */
- uiPupMenuSaveOver(C,
handler-op, path);
+ uiPupMenuSaveOver(C,
handler-op, (path)? path: );
}
else {
int retval=
handler-op-type-exec(C, handler-op);
@@ -961,7 +961,8 @@
WM_operator_free(handler-op);
wm_event_free_handler(handler);
- MEM_freeN(path);
+ if(path)
+ MEM_freeN(path);
action= WM_HANDLER_BREAK;
}
___
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 [23542] trunk/blender/release/scripts/io/ export_fbx.py: Fix #19483: error using FBX export script, diffuse_reflection
Revision: 23542 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23542 Author: blendix Date: 2009-09-28 18:11:55 +0200 (Mon, 28 Sep 2009) Log Message: --- Fix #19483: error using FBX export script, diffuse_reflection changed to diffuse_intensity. Modified Paths: -- trunk/blender/release/scripts/io/export_fbx.py Modified: trunk/blender/release/scripts/io/export_fbx.py === --- trunk/blender/release/scripts/io/export_fbx.py 2009-09-28 16:11:06 UTC (rev 23541) +++ trunk/blender/release/scripts/io/export_fbx.py 2009-09-28 16:11:55 UTC (rev 23542) @@ -1211,13 +1211,13 @@ mat_colamb = world_amb # mat_colamb = tuple([c for c in world_amb]) - mat_dif = mat.diffuse_reflection + mat_dif = mat.diffuse_intensity # mat_dif = mat.ref mat_amb = mat.ambient # mat_amb = mat.amb mat_hard = (float(mat.specular_hardness)-1)/5.10 # mat_hard = (float(mat.hard)-1)/5.10 - mat_spec = mat.specular_reflection/2.0 + mat_spec = mat.specular_intensity/2.0 # mat_spec = mat.spec/2.0 mat_alpha = mat.alpha mat_emit = mat.emit ___ 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 [23543] trunk/blender/release/scripts/ui/ buttons_particle.py: Fix python error in boids panel, missing variable psys .
Revision: 23543 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23543 Author: blendix Date: 2009-09-28 18:13:23 +0200 (Mon, 28 Sep 2009) Log Message: --- Fix python error in boids panel, missing variable psys. Modified Paths: -- trunk/blender/release/scripts/ui/buttons_particle.py Modified: trunk/blender/release/scripts/ui/buttons_particle.py === --- trunk/blender/release/scripts/ui/buttons_particle.py2009-09-28 16:11:55 UTC (rev 23542) +++ trunk/blender/release/scripts/ui/buttons_particle.py2009-09-28 16:13:23 UTC (rev 23543) @@ -502,7 +502,8 @@ return psys.settings.physics_type=='BOIDS' def draw(self, context): - boids = context.particle_system.settings.boids + psys = context.particle_system + boids = psys.settings.boids layout = self.layout layout.enabled = particle_panel_enabled(psys) ___ 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 [23544] branches/ge_dyn_load/source: - remove unused functions
Revision: 23544
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23544
Author: campbellbarton
Date: 2009-09-28 20:05:44 +0200 (Mon, 28 Sep 2009)
Log Message:
---
- remove unused functions
- loading scenes from other files was broken.
- Made Replace event manager funcs one generic funcs all sensors share.
Modified Paths:
--
branches/ge_dyn_load/source/blender/blenloader/BLO_readfile.h
branches/ge_dyn_load/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ge_dyn_load/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_EventManager.h
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_ISensor.h
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_LogicManager.h
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/ge_dyn_load/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/ge_dyn_load/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/ge_dyn_load/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/ge_dyn_load/source/gameengine/Ketsji/KX_GameObject.cpp
branches/ge_dyn_load/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/ge_dyn_load/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/ge_dyn_load/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/ge_dyn_load/source/gameengine/Ketsji/KX_RaySensor.h
branches/ge_dyn_load/source/gameengine/Ketsji/KX_Scene.cpp
branches/ge_dyn_load/source/gameengine/Ketsji/KX_SoundActuator.h
branches/ge_dyn_load/source/gameengine/Ketsji/KX_TouchSensor.h
branches/ge_dyn_load/source/gameengine/Rasterizer/RAS_BucketManager.cpp
Modified: branches/ge_dyn_load/source/blender/blenloader/BLO_readfile.h
===
--- branches/ge_dyn_load/source/blender/blenloader/BLO_readfile.h
2009-09-28 16:13:23 UTC (rev 23543)
+++ branches/ge_dyn_load/source/blender/blenloader/BLO_readfile.h
2009-09-28 18:05:44 UTC (rev 23544)
@@ -211,7 +211,7 @@
void BLO_library_append_end(const struct bContext *C, struct Main *mainl,
BlendHandle** bh, int idcode, short flag);
/* deprecated */
-#if 1
+#if 0
void BLO_script_library_append(BlendHandle **bh, char *dir, char *name, int
idcode, short flag, struct Main *mainvar, struct Scene *scene, struct
ReportList *reports);
#endif
Modified:
branches/ge_dyn_load/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===
---
branches/ge_dyn_load/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-09-28 16:13:23 UTC (rev 23543)
+++
branches/ge_dyn_load/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-09-28 18:05:44 UTC (rev 23544)
@@ -1061,8 +1061,8 @@
return meshobj;
}
-
+
static PHY_MaterialProps *CreateMaterialFromBlenderObject(struct Object*
blenderobject)
{
PHY_MaterialProps *materialProps = new PHY_MaterialProps;
Modified:
branches/ge_dyn_load/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===
---
branches/ge_dyn_load/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
2009-09-28 16:13:23 UTC (rev 23543)
+++
branches/ge_dyn_load/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
2009-09-28 18:05:44 UTC (rev 23544)
@@ -91,7 +91,20 @@
#include DNA_space_types.h
}
+/* Only for dynamic loading and merging */
#include RAS_BucketManager.h // XXX cant stay
+#include KX_BlenderSceneConverter.h
+#include BL_BlenderDataConversion.h
+#include KX_MeshProxy.h
+#include RAS_MeshObject.h
+extern C {
+ #include BKE_context.h
+ #include BLO_readfile.h
+ #include BKE_report.h
+ #include DNA_space_types.h
+ #include DNA_windowmanager_types.h /* report api */
+ #include ../../blender/blenlib/BLI_linklist.h
+}
KX_BlenderSceneConverter::KX_BlenderSceneConverter(
struct Main* maggie,
@@ -108,9 +121,6 @@
m_newfilename = ;
}
-extern C { /* free_main */
- #include BKE_library.h
-}
KX_BlenderSceneConverter::~KX_BlenderSceneConverter()
{
@@ -324,9 +334,6 @@
#ifdef USE_BULLET
case
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23546] branches/ge_dyn_load: merge https: //svn.blender.org/svnroot/bf-blender/trunk/blender -r23504:23545
Revision: 23546 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23546 Author: campbellbarton Date: 2009-09-28 21:40:50 +0200 (Mon, 28 Sep 2009) Log Message: --- merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23504:23545 Modified Paths: -- branches/ge_dyn_load/SConstruct branches/ge_dyn_load/extern/ffmpeg/SConscript branches/ge_dyn_load/extern/x264/SConscript branches/ge_dyn_load/extern/xvidcore/SConscript branches/ge_dyn_load/intern/audaspace/intern/AUD_C-API.cpp branches/ge_dyn_load/release/Makefile branches/ge_dyn_load/source/blender/blenkernel/BKE_armature.h branches/ge_dyn_load/source/blender/blenkernel/intern/action.c branches/ge_dyn_load/source/blender/blenkernel/intern/armature.c branches/ge_dyn_load/source/blender/blenkernel/intern/constraint.c branches/ge_dyn_load/source/blender/blenkernel/intern/ipo.c branches/ge_dyn_load/source/blender/blenkernel/intern/object.c branches/ge_dyn_load/source/blender/blenlib/BLI_arithb.h branches/ge_dyn_load/source/blender/blenlib/intern/dynlib.c branches/ge_dyn_load/source/blender/blenlib/intern/util.c branches/ge_dyn_load/source/blender/blenloader/BLO_readfile.h branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c branches/ge_dyn_load/source/blender/editors/animation/anim_markers.c branches/ge_dyn_load/source/blender/editors/animation/keyframing.c branches/ge_dyn_load/source/blender/editors/animation/keyingsets.c branches/ge_dyn_load/source/blender/editors/armature/armature_ops.c branches/ge_dyn_load/source/blender/editors/armature/editarmature.c branches/ge_dyn_load/source/blender/editors/armature/poseobject.c branches/ge_dyn_load/source/blender/editors/include/ED_fileselect.h branches/ge_dyn_load/source/blender/editors/include/ED_mesh.h branches/ge_dyn_load/source/blender/editors/include/ED_previewrender.h branches/ge_dyn_load/source/blender/editors/include/UI_interface.h branches/ge_dyn_load/source/blender/editors/interface/interface.c branches/ge_dyn_load/source/blender/editors/interface/interface_icons.c branches/ge_dyn_load/source/blender/editors/interface/interface_intern.h branches/ge_dyn_load/source/blender/editors/interface/interface_layout.c branches/ge_dyn_load/source/blender/editors/interface/interface_templates.c branches/ge_dyn_load/source/blender/editors/interface/interface_widgets.c branches/ge_dyn_load/source/blender/editors/interface/view2d.c branches/ge_dyn_load/source/blender/editors/mesh/editmesh_tools.c branches/ge_dyn_load/source/blender/editors/mesh/loopcut.c branches/ge_dyn_load/source/blender/editors/mesh/mesh_ops.c branches/ge_dyn_load/source/blender/editors/object/object_edit.c branches/ge_dyn_load/source/blender/editors/preview/previewrender.c branches/ge_dyn_load/source/blender/editors/space_file/file_draw.c branches/ge_dyn_load/source/blender/editors/space_file/file_ops.c branches/ge_dyn_load/source/blender/editors/space_file/filesel.c branches/ge_dyn_load/source/blender/editors/space_file/space_file.c branches/ge_dyn_load/source/blender/editors/space_graph/graph_edit.c branches/ge_dyn_load/source/blender/editors/space_image/space_image.c branches/ge_dyn_load/source/blender/editors/space_node/drawnode.c branches/ge_dyn_load/source/blender/editors/space_outliner/outliner.c branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_buttons.c branches/ge_dyn_load/source/blender/editors/transform/transform.c branches/ge_dyn_load/source/blender/editors/transform/transform.h branches/ge_dyn_load/source/blender/editors/transform/transform_conversions.c branches/ge_dyn_load/source/blender/editors/transform/transform_generics.c branches/ge_dyn_load/source/blender/editors/transform/transform_manipulator.c branches/ge_dyn_load/source/blender/editors/transform/transform_ops.c branches/ge_dyn_load/source/blender/imbuf/intern/divers.c branches/ge_dyn_load/source/blender/makesdna/DNA_action_types.h branches/ge_dyn_load/source/blender/makesdna/DNA_anim_types.h branches/ge_dyn_load/source/blender/makesdna/DNA_object_types.h branches/ge_dyn_load/source/blender/makesrna/RNA_types.h branches/ge_dyn_load/source/blender/makesrna/intern/makesrna.c branches/ge_dyn_load/source/blender/makesrna/intern/rna_ID.c branches/ge_dyn_load/source/blender/makesrna/intern/rna_access.c branches/ge_dyn_load/source/blender/makesrna/intern/rna_armature.c branches/ge_dyn_load/source/blender/makesrna/intern/rna_mesh_api.c branches/ge_dyn_load/source/blender/makesrna/intern/rna_object.c branches/ge_dyn_load/source/blender/makesrna/intern/rna_pose.c branches/ge_dyn_load/source/blender/makesrna/intern/rna_scene.c branches/ge_dyn_load/source/blender/makesrna/intern/rna_sequence.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23547] trunk/blender: Adding back more functionalities for transform orientations.
Revision: 23547 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23547 Author: theeth Date: 2009-09-28 21:49:36 +0200 (Mon, 28 Sep 2009) Log Message: --- Adding back more functionalities for transform orientations. Create new orientation is now Ctrl-Alt-Space (Alt-Space is select orientation and the old ctrl-shift-c is taken by add constraints). New orientation panel in 3d view sidebar (nkey) has operator buttons for select, create and delete. Eventually, this should become a list. Note that orientation operators are missing notifiers to properly redraw the 3d view and its header properly. Modified Paths: -- trunk/blender/release/scripts/ui/space_view3d.py trunk/blender/source/blender/editors/include/ED_transform.h trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c trunk/blender/source/blender/editors/transform/transform.h trunk/blender/source/blender/editors/transform/transform_manipulator.c trunk/blender/source/blender/editors/transform/transform_ops.c trunk/blender/source/blender/editors/transform/transform_orientations.c Modified: trunk/blender/release/scripts/ui/space_view3d.py === --- trunk/blender/release/scripts/ui/space_view3d.py2009-09-28 19:40:50 UTC (rev 23546) +++ trunk/blender/release/scripts/ui/space_view3d.py2009-09-28 19:49:36 UTC (rev 23547) @@ -1285,6 +1285,26 @@ col.itemR(bg, offset_x, text=X) col.itemR(bg, offset_y, text=Y) +class VIEW3D_PT_transform_orientations(bpy.types.Panel): + __space_type__ = 'VIEW_3D' + __region_type__ = 'UI' + __label__ = Transform Orientations + __default_closed__ = True + + def poll(self, context): + view = context.space_data + return (view) + + def draw(self, context): + layout = self.layout + + view = context.space_data + + col = layout.column() + col.itemO(TFM_OT_select_orientation, text=Select) + col.itemO(TFM_OT_create_orientation, text=Create) + col.itemO(TFM_OT_delete_orientation, text=Delete) + bpy.types.register(VIEW3D_HT_header) # Header bpy.types.register(VIEW3D_MT_view) #View Menus @@ -1360,3 +1380,4 @@ bpy.types.register(VIEW3D_PT_3dview_meshdisplay) bpy.types.register(VIEW3D_PT_3dview_curvedisplay) bpy.types.register(VIEW3D_PT_background_image) +bpy.types.register(VIEW3D_PT_transform_orientations) \ No newline at end of file Modified: trunk/blender/source/blender/editors/include/ED_transform.h === --- trunk/blender/source/blender/editors/include/ED_transform.h 2009-09-28 19:40:50 UTC (rev 23546) +++ trunk/blender/source/blender/editors/include/ED_transform.h 2009-09-28 19:49:36 UTC (rev 23547) @@ -111,10 +111,12 @@ struct TransformOrientation; struct bContext; +struct ReportList; void BIF_clearTransformOrientation(struct bContext *C); void BIF_removeTransformOrientation(struct bContext *C, struct TransformOrientation *ts); -void BIF_manageTransformOrientation(struct bContext *C, int confirm, int set); +void BIF_removeTransformOrientationIndex(struct bContext *C, int index); +void BIF_createTransformOrientation(struct bContext *C, struct ReportList *reports, char *name, int use, int overwrite); int BIF_menuselectTransformOrientation(void); void BIF_selectTransformOrientation(struct bContext *C, struct TransformOrientation *ts); void BIF_selectTransformOrientationValue(struct bContext *C, int orientation); Modified: trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c === --- trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c 2009-09-28 19:40:50 UTC (rev 23546) +++ trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c 2009-09-28 19:49:36 UTC (rev 23547) @@ -886,7 +886,7 @@ } break; case B_TRANSFORMSPACEADD: - BIF_manageTransformOrientation(C, 1, 0); + BIF_createTransformOrientation(C, NULL, , 1, 0); break; case B_TRANSFORMSPACECLEAR: BIF_clearTransformOrientation(C); Modified: trunk/blender/source/blender/editors/transform/transform.h === --- trunk/blender/source/blender/editors/transform/transform.h 2009-09-28 19:40:50 UTC (rev 23546) +++ trunk/blender/source/blender/editors/transform/transform.h 2009-09-28 19:49:36 UTC (rev 23547) @@ -38,6 +38,7 @@ struct TransInfo; struct TransData; +struct TransformOrientation; struct TransSnap; struct NumInput; struct Object; @@ -54,6 +55,7 @@ struct wmEvent; struct wmTimer; struct ARegion; +struct
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23548] trunk/blender/release/scripts/ modules: SVN maintenance.
Revision: 23548 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23548 Author: gsrb3d Date: 2009-09-29 00:14:03 +0200 (Tue, 29 Sep 2009) Log Message: --- SVN maintenance. Property Changed: trunk/blender/release/scripts/modules/autocomplete.py trunk/blender/release/scripts/modules/bpy_sys.py Property changes on: trunk/blender/release/scripts/modules/autocomplete.py ___ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Property changes on: trunk/blender/release/scripts/modules/bpy_sys.py ___ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native ___ 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 [23549] trunk/blender/source: Removed the termporary defines added to make the Game Engine compile.
Revision: 23549
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23549
Author: aligorith
Date: 2009-09-29 03:52:54 +0200 (Tue, 29 Sep 2009)
Log Message:
---
Removed the termporary defines added to make the Game Engine compile. Hopefully
this fixes all of the cases which broke.
Modified Paths:
--
trunk/blender/source/blender/makesdna/DNA_action_types.h
trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: trunk/blender/source/blender/makesdna/DNA_action_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_action_types.h2009-09-28
22:14:03 UTC (rev 23548)
+++ trunk/blender/source/blender/makesdna/DNA_action_types.h2009-09-29
01:52:54 UTC (rev 23549)
@@ -553,13 +553,4 @@
ACHAN_MOVED = (131),
} ACHAN_FLAG;
-// XXX Incorrect, Temp for building
-#define PCHAN_ROT_QUAT -1
-#define PCHAN_ROT_XYZ -1
-#define PCHAN_ROT_XZY -1
-#define PCHAN_ROT_YXZ -1
-#define PCHAN_ROT_YZX -1
-#define PCHAN_ROT_ZXY -1
-#define PCHAN_ROT_ZYX -1
-
#endif
Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
===
--- trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
2009-09-28 22:14:03 UTC (rev 23548)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
2009-09-29 01:52:54 UTC (rev 23549)
@@ -152,7 +152,7 @@
for (dchan = (bPoseChannel*)dst-chanbase.first; dchan;
dchan=(bPoseChannel*)dchan-next, schan= (bPoseChannel*)schan-next){
// always blend on all channels since we don't know which one
has been set
/* quat interpolation done separate */
- if (schan-rotmode == PCHAN_ROT_QUAT) {
+ if (schan-rotmode == ROT_MODE_QUAT) {
float dquat[4], squat[4];
QUATCOPY(dquat, dchan-quat);
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp2009-09-28
22:14:03 UTC (rev 23548)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp2009-09-29
01:52:54 UTC (rev 23549)
@@ -1259,13 +1259,13 @@
KX_MACRO_addTypesToDict(d, KX_ACT_ARMATURE_SETWEIGHT,
ACT_ARM_SETWEIGHT);
/* BL_Armature Channel rotation_mode */
- KX_MACRO_addTypesToDict(d, PCHAN_ROT_QUAT, PCHAN_ROT_QUAT);
- KX_MACRO_addTypesToDict(d, PCHAN_ROT_XYZ, PCHAN_ROT_XYZ);
- KX_MACRO_addTypesToDict(d, PCHAN_ROT_XZY, PCHAN_ROT_XZY);
- KX_MACRO_addTypesToDict(d, PCHAN_ROT_YXZ, PCHAN_ROT_YXZ);
- KX_MACRO_addTypesToDict(d, PCHAN_ROT_YZX, PCHAN_ROT_YZX);
- KX_MACRO_addTypesToDict(d, PCHAN_ROT_ZXY, PCHAN_ROT_ZXY);
- KX_MACRO_addTypesToDict(d, PCHAN_ROT_ZYX, PCHAN_ROT_ZYX);
+ KX_MACRO_addTypesToDict(d, ROT_MODE_QUAT, ROT_MODE_QUAT);
+ KX_MACRO_addTypesToDict(d, ROT_MODE_XYZ, ROT_MODE_XYZ);
+ KX_MACRO_addTypesToDict(d, ROT_MODE_XZY, ROT_MODE_XZY);
+ KX_MACRO_addTypesToDict(d, ROT_MODE_YXZ, ROT_MODE_YXZ);
+ KX_MACRO_addTypesToDict(d, ROT_MODE_YZX, ROT_MODE_YZX);
+ KX_MACRO_addTypesToDict(d, ROT_MODE_ZXY, ROT_MODE_ZXY);
+ KX_MACRO_addTypesToDict(d, ROT_MODE_ZYX, ROT_MODE_ZYX);
// Check for errors
if (PyErr_Occurred())
___
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 [23550] trunk/blender/source/blender/ editors/mesh/mesh_data.c: Bugfix #19490: Adding UV texture, adds Vertex color instead
Revision: 23550
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23550
Author: aligorith
Date: 2009-09-29 04:19:27 +0200 (Tue, 29 Sep 2009)
Log Message:
---
Bugfix #19490: Adding UV texture, adds Vertex color instead
Seems to have been a copy+paste error (code for Vertex Color adding was pasted
in place of texture paint). Restored the code from an earlier revision (from
another file).
Modified Paths:
--
trunk/blender/source/blender/editors/mesh/mesh_data.c
Modified: trunk/blender/source/blender/editors/mesh/mesh_data.c
===
--- trunk/blender/source/blender/editors/mesh/mesh_data.c 2009-09-29
01:52:54 UTC (rev 23549)
+++ trunk/blender/source/blender/editors/mesh/mesh_data.c 2009-09-29
02:19:27 UTC (rev 23550)
@@ -159,36 +159,30 @@
int ED_mesh_uv_texture_add(bContext *C, Scene *scene, Object *ob, Mesh *me)
{
EditMesh *em;
- MCol *mcol;
int layernum;
if(me-edit_mesh) {
em= me-edit_mesh;
- layernum= CustomData_number_of_layers(em-fdata, CD_MCOL);
- if(layernum = MAX_MCOL)
- return 0;
+ layernum= CustomData_number_of_layers(em-fdata, CD_MTFACE);
+ if(layernum = MAX_MTFACE)
+ return OPERATOR_CANCELLED;
- EM_add_data_layer(em, em-fdata, CD_MCOL);
- CustomData_set_layer_active(em-fdata, CD_MCOL, layernum);
+ EM_add_data_layer(em, em-fdata, CD_MTFACE);
+ CustomData_set_layer_active(em-fdata, CD_MTFACE, layernum);
}
else {
- layernum= CustomData_number_of_layers(me-fdata, CD_MCOL);
- if(layernum = MAX_MCOL)
- return 0;
+ layernum= CustomData_number_of_layers(me-fdata, CD_MTFACE);
+ if(layernum = MAX_MTFACE)
+ return OPERATOR_CANCELLED;
- mcol= me-mcol;
-
- if(me-mcol)
- CustomData_add_layer(me-fdata, CD_MCOL, CD_DUPLICATE,
me-mcol, me-totface);
+ if(me-mtface)
+ CustomData_add_layer(me-fdata, CD_MTFACE,
CD_DUPLICATE, me-mtface, me-totface);
else
- CustomData_add_layer(me-fdata, CD_MCOL, CD_DEFAULT,
NULL, me-totface);
+ CustomData_add_layer(me-fdata, CD_MTFACE, CD_DEFAULT,
NULL, me-totface);
- CustomData_set_layer_active(me-fdata, CD_MCOL, layernum);
+ CustomData_set_layer_active(me-fdata, CD_MTFACE, layernum);
mesh_update_customdata_pointers(me);
-
- if(!mcol ob)
- shadeMeshMCol(scene, ob, me);
}
DAG_id_flush_update(me-id, OB_RECALC_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 [23551] trunk/blender/source/blenderplayer /bad_level_call_stubs/stubs.c: bge player - stubs update
Revision: 23551
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23551
Author: dfelinto
Date: 2009-09-29 07:22:44 +0200 (Tue, 29 Sep 2009)
Log Message:
---
bge player - stubs update
*note in order to build blenderplayer with cmake+msvc one needs to comment all
smoke references in stubs.c
- scons + msvc is building fine (raising some warnings for the smole references
though)
- cmake in linux should be building as well (the smoke references were inserted
in stubs to please this building environment IIRC)
Modified Paths:
--
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
2009-09-29 02:19:27 UTC (rev 23550)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
2009-09-29 05:22:44 UTC (rev 23551)
@@ -95,7 +95,7 @@
void ED_area_tag_redraw(struct ScrArea *sa){}
void WM_event_add_fileselect(struct bContext *C, struct wmOperator *op){}
void ED_node_texture_default(struct Tex *tx){}
-void ED_node_changed_update(struct bContext *C, struct bNode *node);
+void ED_node_changed_update(struct bContext *C, struct bNode *node){}
int text_file_modified(struct Text *text){return 0;}
void ED_node_shader_default(struct Material *ma){}
void ED_screen_animation_timer_update(struct bContext *C, int redraws){}
@@ -113,6 +113,18 @@
void uiLayoutSetAlignment(struct uiLayout *layout, int alignment){}
void uiLayoutSetScaleX(struct uiLayout *layout, float scale){}
void uiLayoutSetScaleY(struct uiLayout *layout, float scale){}
+void ED_base_object_free_and_unlink(struct Scene *scene, struct Base *base){}
+void ED_mesh_calc_normals(struct Mesh *me){}
+void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int
verts, int edges, int faces){}
+void ED_mesh_material_add(struct Mesh *me, struct Material *ma){}
+void ED_mesh_transform(struct Mesh *me, float *mat){}
+void ED_mesh_update(struct Mesh *mesh, struct bContext *C){}
+int ED_mesh_uv_texture_add(struct bContext *C, struct Scene *scene, struct
Object *ob, struct Mesh *me){return 0;}
+void ED_object_apply_obmat(struct Object *ob){}
+void ED_object_constraint_dependency_update(struct Scene *scene, struct Object
*ob){}
+void ED_object_constraint_update(struct Object *ob){}
+struct bDeformGroup *ED_vgroup_add_name(struct Object *ob, char *name){return
(struct bDeformGroup *) NULL;}
+void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int
vertnum, float weight, int assignmode){}
void uiItemR(struct uiLayout *layout, char *name, int icon, struct PointerRNA
*ptr, char *propname, int flag){}
@@ -155,6 +167,7 @@
void uiTemplateHeader3D(struct uiLayout *layout, struct bContext *C){}
void uiTemplate_view3d_select_faceselmenu(struct uiLayout *layout, struct
bContext *C){}
void uiTemplateTextureImage(struct uiLayout *layout, struct bContext *C,
struct Tex *tex){}
+void uiTemplateImage(struct uiLayout *layout, struct bContext *C, struct
PointerRNA *ptr, char *propname, struct PointerRNA *userptr, int compact){}
/* rna render */
struct RenderResult *RE_engine_begin_result(struct RenderEngine *engine, int
x, int y, int w, int h){return (struct RenderResult *) NULL;}
@@ -171,11 +184,13 @@
struct wmOperatorType *WM_operatortype_exists(const char *idname){return
(struct wmOperatorType *) NULL;}
int WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, int
context, struct PointerRNA *properties, struct ReportList *reports){return 0;}
int WM_operatortype_remove(const char *idname){return 0;}
+int WM_operator_poll(struct bContext *C, struct wmOperatorType *ot){return 0;}
void WM_operator_properties_free(struct PointerRNA *ptr){}
void WM_operator_properties_create(struct PointerRNA *ptr, const char
*opstring){}
void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType*, void*),
void *userdata){}
void WM_operator_bl_idname(char *to, const char *from){}
short insert_keyframe (struct ID *id, struct bAction *act, const char group[],
const char rna_path[], int array_index, float cfra, short flag){return 0;}
+char *WM_operator_pystring(struct bContext *C, struct wmOperatorType *ot,
struct PointerRNA *opptr, int all_args){return NULL;}
/* smoke */
void lzo1x_1_compress(void) {return;}
@@ -199,3 +214,5 @@
void smoke_get_obstacle(void) {return;}
void smoke_get_index(void) {return;}
void smoke_step(void) {return;}
+
+char blender_path(){return NULL;}
\ No newline at end of file
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
