Revision: 36335
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36335
Author: campbellbarton
Date: 2011-04-26 10:38:18 +0000 (Tue, 26 Apr 2011)
Log Message:
-----------
- fix for player linking
- added notes to release todo's.
- renamed view3d view transform matching functions.
- added assert in edge split modifier to make a certain bug easier to spot.
Modified Paths:
--------------
trunk/blender/release/release_todo.txt
trunk/blender/source/blender/editors/include/ED_view3d.h
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/release/release_todo.txt
===================================================================
--- trunk/blender/release/release_todo.txt 2011-04-26 10:00:11 UTC (rev
36334)
+++ trunk/blender/release/release_todo.txt 2011-04-26 10:38:18 UTC (rev
36335)
@@ -2,8 +2,19 @@
Please check on all points before a release:
* Version bump (source/blender/blenkernel/BKE_blender.h)
-* Update of splash.png (release/datafiles) and splash.png.c
(source/blender/editors/datafiles)
+ be sure to check all these variables are correct:
+ BLENDER_VERSION
+ BLENDER_SUBVERSION
+ BLENDER_VERSION_CHAR
+ BLENDER_VERSION_CYCLE
+ These values are available in the api and used for documentation generation
+ so they should be correct before any release, even minor ones.
+
+* Update of splash.png (release/datafiles) and splash.png.c
+ ./source/blender/editors/datafiles
+
* Update of readme.html (release/text)
-* New Link to correct Release Log page in the operator
-(release/scripts/startup/bl_ui/space_info.py and
source/blender/windowmanager/intern/wm_operators.c)
+* New Link to correct Release Log page in the operator:
+ ./release/scripts/startup/bl_ui/space_info.py and
+ ./source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/editors/include/ED_view3d.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_view3d.h 2011-04-26
10:00:11 UTC (rev 36334)
+++ trunk/blender/source/blender/editors/include/ED_view3d.h 2011-04-26
10:38:18 UTC (rev 36335)
@@ -185,8 +185,8 @@
/* assigning view matrix */
-void view3d_settings_from_mat(float mat[][4], float *ofs, float *quat, float
*dist);
-void view3d_settings_from_ob(struct Object *ob, float *ofs, float *quat, float
*dist, float *lens);
+void view3d_apply_mat4(float mat[][4], float *ofs, float *quat, float *dist);
+void view3d_apply_ob(struct Object *ob, float *ofs, float *quat, float *dist,
float *lens);
int view3d_is_ortho(struct View3D *v3d, struct RegionView3D *rv3d);
#endif /* ED_VIEW3D_H */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-04-26 10:00:11 UTC (rev 36334)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-04-26 10:38:18 UTC (rev 36335)
@@ -790,7 +790,7 @@
View3D *v3d = vod->sa->spacedata.first;
if(v3d->camera) {
- view3d_settings_from_ob(v3d->camera, rv3d->ofs,
rv3d->viewquat, &rv3d->dist, NULL);
+ view3d_apply_ob(v3d->camera, rv3d->ofs,
rv3d->viewquat, &rv3d->dist, NULL);
}
if(rv3d->persp==RV3D_CAMOB) {
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2011-04-26 10:00:11 UTC (rev 36334)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2011-04-26 10:38:18 UTC (rev 36335)
@@ -135,7 +135,7 @@
*
* The dist is not modified for this function, if NULL its assimed zero
* */
-void view3d_settings_from_mat(float mat[][4], float *ofs, float *quat, float
*dist)
+void view3d_apply_mat4(float mat[][4], float *ofs, float *quat, float *dist)
{
/* Offset */
if (ofs)
@@ -164,9 +164,9 @@
}
}
-void view3d_settings_from_ob(Object *ob, float *ofs, float *quat, float *dist,
float *lens)
+void view3d_apply_ob(Object *ob, float *ofs, float *quat, float *dist, float
*lens)
{
- view3d_settings_from_mat(ob->obmat, ofs, quat, dist);
+ view3d_apply_mat4(ob->obmat, ofs, quat, dist);
if (lens) {
object_lens_clip_settings(ob, lens, NULL, NULL);
@@ -211,7 +211,7 @@
if(lens) sms.new_lens= *lens;
if (camera) {
- view3d_settings_from_ob(camera, sms.new_ofs, sms.new_quat,
&sms.new_dist, &sms.new_lens);
+ view3d_apply_ob(camera, sms.new_ofs, sms.new_quat,
&sms.new_dist, &sms.new_lens);
sms.to_camera= 1; /* restore view3d values in end */
}
@@ -236,7 +236,7 @@
/* original values */
if (oldcamera) {
sms.orig_dist= rv3d->dist; // below function
does weird stuff with it...
- view3d_settings_from_ob(oldcamera,
sms.orig_ofs, sms.orig_quat, &sms.orig_dist, &sms.orig_lens);
+ view3d_apply_ob(oldcamera, sms.orig_ofs,
sms.orig_quat, &sms.orig_dist, &sms.orig_lens);
}
else {
copy_v3_v3(sms.orig_ofs, rv3d->ofs);
@@ -1188,7 +1188,7 @@
rv3d->persp=RV3D_PERSP;
rv3d->dist= 0.0;
- view3d_settings_from_ob(v3d->camera, rv3d->ofs, NULL,
NULL, &v3d->lens);
+ view3d_apply_ob(v3d->camera, rv3d->ofs, NULL, NULL,
&v3d->lens);
smooth_view(NULL, NULL, NULL, orig_ofs, new_quat,
&orig_dist, &orig_lens); // XXX
rv3d->persp=RV3D_CAMOB; /* just to be polite, not
needed */
@@ -1931,7 +1931,7 @@
copy_v3_v3(orig_ofs, rv3d->ofs);
rv3d->persp= RV3D_PERSP;
rv3d->dist= 0.0;
- view3d_settings_from_ob(v3d->camera, rv3d->ofs, NULL, NULL,
&v3d->lens);
+ view3d_apply_ob(v3d->camera, rv3d->ofs, NULL, NULL, &v3d->lens);
smooth_view(NULL, NULL, NULL, orig_ofs, new_quat, &orig_dist,
&orig_lens); // XXX
} else {
if (rv3d->persp==RV3D_CAMOB) rv3d->persp= RV3D_PERSP; /* switch
out of camera mode */
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-04-26
10:00:11 UTC (rev 36334)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-04-26
10:38:18 UTC (rev 36335)
@@ -400,7 +400,7 @@
{
RegionView3D *rv3d= (RegionView3D *)(ptr->data);
negate_v3_v3(rv3d->ofs, values);
- view3d_settings_from_mat((float (*)[4])values, rv3d->ofs,
rv3d->viewquat, &rv3d->dist);
+ view3d_apply_mat4((float (*)[4])values, rv3d->ofs, rv3d->viewquat,
&rv3d->dist);
}
/* Space Image Editor */
Modified: trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
2011-04-26 10:00:11 UTC (rev 36334)
+++ trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
2011-04-26 10:38:18 UTC (rev 36335)
@@ -38,6 +38,8 @@
/* EdgeSplit modifier: Splits edges in the mesh according to sharpness flag
* or edge angle (can be used to achieve autosmoothing) */
+#include <assert.h>
+
#include "DNA_meshdata_types.h"
#include "BLI_listbase.h"
@@ -125,6 +127,8 @@
{
SmoothVert *copy = &mesh->verts[mesh->num_verts];
+ assert(vert != NULL);
+
if(mesh->num_verts >= mesh->max_verts) {
printf("Attempted to add a SmoothMesh vert beyond end of
array\n");
return NULL;
Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
2011-04-26 10:00:11 UTC (rev 36334)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
2011-04-26 10:38:18 UTC (rev 36335)
@@ -241,6 +241,7 @@
void ED_view3d_scene_layers_update(struct Main *bmain, struct Scene *scene){}
int ED_view3d_scene_layer_set(int lay, const int *values){return 0;}
void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar){}
+void view3d_apply_mat4(float mat[][4], float *ofs, float *quat, float *dist){}
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){}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
