Revision: 41962
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41962
Author: campbellbarton
Date: 2011-11-18 09:34:45 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r41954:41961
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41954
Modified Paths:
--------------
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
branches/bmesh/blender/source/blender/blenkernel/BKE_scene.h
branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/render/render_shading.c
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41954
+ /trunk/blender:39992-41961
Modified: branches/bmesh/blender/build_files/scons/tools/Blender.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-11-18
09:23:55 UTC (rev 41961)
+++ branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-11-18
09:34:45 UTC (rev 41962)
@@ -34,6 +34,7 @@
bc = bcolors.bcolors()
import btools
VERSION = btools.VERSION
+VERSION_RELEASE_CYCLE = btools.VERSION_RELEASE_CYCLE
Split = SCons.Util.Split
Action = SCons.Action.Action
@@ -584,6 +585,10 @@
cmd = 'cp -R %s/release/scripts
%s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
+ if VERSION_RELEASE_CYCLE == "release":
+ cmd = 'rm -rf
%s/%s.app/Contents/MacOS/%s/scripts/addons_contrib'%(installdir,binary,VERSION)
+ commands.getoutput(cmd)
+
if env['WITH_BF_CYCLES']:
croot = '%s/intern/cycles' % (bldroot)
cinstalldir = '%s/%s.app/Contents/MacOS/%s/scripts/addons/cycles'
% (installdir,binary,VERSION)
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41954
+ /trunk/blender/release:31524-41961
Modified: branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
2011-11-18 09:23:55 UTC (rev 41961)
+++ branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
2011-11-18 09:34:45 UTC (rev 41962)
@@ -78,7 +78,7 @@
"finnish", "fi_FI",
"swedish", "sv_SE",
"french", "fr_FR",
- "spanish", "es_ES",
+ "spanish", "es",
"catalan", "ca_AD",
"czech", "cs_CZ",
"ptb", "pt_BR",
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_scene.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_scene.h
2011-11-18 09:23:55 UTC (rev 41961)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_scene.h
2011-11-18 09:34:45 UTC (rev 41962)
@@ -44,6 +44,7 @@
struct Object;
struct QuicktimeCodecData;
struct RenderData;
+struct SceneRenderLayer;
struct Scene;
struct Text;
struct Text;
@@ -93,7 +94,8 @@
void scene_update_for_newframe(struct Main *bmain, struct Scene *sce, unsigned
int lay);
-void scene_add_render_layer(struct Scene *sce);
+struct SceneRenderLayer *scene_add_render_layer(struct Scene *sce, const char
*name);
+int scene_remove_render_layer(struct Main *main, struct Scene *scene, struct
SceneRenderLayer *srl);
/* render profile */
int get_render_subsurf_level(struct RenderData *r, int level);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
2011-11-18 09:23:55 UTC (rev 41961)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
2011-11-18 09:34:45 UTC (rev 41962)
@@ -44,6 +44,7 @@
#include "DNA_anim_types.h"
#include "DNA_group_types.h"
+#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
@@ -483,7 +484,7 @@
sce->r.osa= 8;
/* note; in header_info.c the scene copy happens..., if you add more to
renderdata it has to be checked there */
- scene_add_render_layer(sce);
+ scene_add_render_layer(sce, NULL);
/* game data */
sce->gm.stereoflag = STEREO_NOSTEREO;
@@ -1086,13 +1087,15 @@
}
/* return default layer, also used to patch old files */
-void scene_add_render_layer(Scene *sce)
+SceneRenderLayer *scene_add_render_layer(Scene *sce, const char *name)
{
SceneRenderLayer *srl;
-// int tot= 1 + BLI_countlist(&sce->r.layers);
-
+
+ if(!name)
+ name= "RenderLayer";
+
srl= MEM_callocN(sizeof(SceneRenderLayer), "new render layer");
- strcpy(srl->name, "RenderLayer");
+ BLI_strncpy(srl->name, name, sizeof(srl->name));
BLI_uniquename(&sce->r.layers, srl, "RenderLayer", '.',
offsetof(SceneRenderLayer, name), sizeof(srl->name));
BLI_addtail(&sce->r.layers, srl);
@@ -1100,8 +1103,47 @@
srl->lay= (1<<20) -1;
srl->layflag= 0x7FFF; /* solid ztra halo edge strand */
srl->passflag= SCE_PASS_COMBINED|SCE_PASS_Z;
+
+ return srl;
}
+int scene_remove_render_layer(Main *bmain, Scene *scene, SceneRenderLayer *srl)
+{
+ const int act= BLI_findindex(&scene->r.layers, srl);
+ Scene *sce;
+
+ if (act == -1) {
+ return 0;
+ }
+ else if ( (scene->r.layers.first == scene->r.layers.last) &&
+ (scene->r.layers.first == srl))
+ {
+ /* ensure 1 layer is kept */
+ return 0;
+ }
+
+ BLI_remlink(&scene->r.layers, srl);
+ MEM_freeN(srl);
+
+ scene->r.actlay= 0;
+
+ for(sce = bmain->scene.first; sce; sce = sce->id.next) {
+ if(sce->nodetree) {
+ bNode *node;
+ for(node = sce->nodetree->nodes.first; node; node =
node->next) {
+ if(node->type==CMP_NODE_R_LAYERS &&
(Scene*)node->id==scene) {
+ if(node->custom1==act)
+ node->custom1= 0;
+ else if(node->custom1>act)
+ node->custom1--;
+ }
+ }
+ }
+ }
+
+ return 1;
+}
+
/* render simplification */
int get_render_subsurf_level(RenderData *r, int lvl)
Modified: branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
2011-11-18 09:23:55 UTC (rev 41961)
+++ branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
2011-11-18 09:34:45 UTC (rev 41962)
@@ -9029,7 +9029,7 @@
if(sce->r.yparts<2) sce->r.yparts= 4;
/* adds default layer */
if(sce->r.layers.first==NULL)
- scene_add_render_layer(sce);
+ scene_add_render_layer(sce, NULL);
else {
SceneRenderLayer *srl;
/* new layer flag for sky, was default for
solid */
Modified: branches/bmesh/blender/source/blender/editors/render/render_shading.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/render/render_shading.c
2011-11-18 09:23:55 UTC (rev 41961)
+++ branches/bmesh/blender/source/blender/editors/render/render_shading.c
2011-11-18 09:34:45 UTC (rev 41962)
@@ -519,7 +519,7 @@
{
Scene *scene= CTX_data_scene(C);
- scene_add_render_layer(scene);
+ scene_add_render_layer(scene, NULL);
scene->r.actlay= BLI_countlist(&scene->r.layers) - 1;
WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene);
@@ -543,33 +543,12 @@
static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op))
{
- Scene *scene = CTX_data_scene(C), *sce;
- SceneRenderLayer *rl;
- int act= scene->r.actlay;
+ Scene *scene = CTX_data_scene(C);
+ SceneRenderLayer *rl = BLI_findlink(&scene->r.layers, scene->r.actlay);
- if(BLI_countlist(&scene->r.layers) <= 1)
+ if(!scene_remove_render_layer(CTX_data_main(C), scene, rl))
return OPERATOR_CANCELLED;
-
- rl= BLI_findlink(&scene->r.layers, scene->r.actlay);
- BLI_remlink(&scene->r.layers, rl);
- MEM_freeN(rl);
- scene->r.actlay= 0;
-
- for(sce = CTX_data_main(C)->scene.first; sce; sce = sce->id.next) {
- if(sce->nodetree) {
- bNode *node;
- for(node = sce->nodetree->nodes.first; node; node =
node->next) {
- if(node->type==CMP_NODE_R_LAYERS &&
(Scene*)node->id==scene) {
- if(node->custom1==act)
- node->custom1= 0;
- else if(node->custom1>act)
- node->custom1--;
- }
- }
- }
- }
-
WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene);
return OPERATOR_FINISHED;
Modified:
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
2011-11-18 09:23:55 UTC (rev 41961)
+++ branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
2011-11-18 09:34:45 UTC (rev 41962)
@@ -1919,11 +1919,10 @@
object_apply_mat4(parent, newmat, 0, 0);
/* make camera have positive z-coordinate */
- mul_v3_m4v3(vec[0], mat, camera->loc);
- if(camera->loc[2]<0) {
+ if(parent->loc[2]<0) {
invert_m4(rot);
mul_m4_m4m4(newmat, mat, rot);
- object_apply_mat4(camera, newmat, 0, 0);
+ object_apply_mat4(parent, newmat, 0, 0);
}
where_is_object(scene, parent);
Property changes on:
branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-41954
+ /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-41961
Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
2011-11-18 09:23:55 UTC (rev 41961)
+++ branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
2011-11-18 09:34:45 UTC (rev 41962)
@@ -2409,9 +2409,15 @@
ContainerRNA *cont= cont_;
PropertyRNA *prop;
- prop= RNA_def_property(cont, identifier, PROP_FLOAT, PROP_EULER); // XXX
- if(len != 0) RNA_def_property_array(prop, len);
- if(default_value) RNA_def_property_float_array_default(prop,
default_value);
+ prop= RNA_def_property(cont, identifier, PROP_FLOAT, (len != 0) ?
PROP_EULER : PROP_ANGLE);
+ if(len != 0) {
+ RNA_def_property_array(prop, len);
+ if(default_value) RNA_def_property_float_array_default(prop,
default_value);
+ }
+ else {
+ /* RNA_def_property_float_default must be called outside */
+ BLI_assert(default_value == NULL);
+ }
if(hardmin != hardmax) RNA_def_property_range(prop, hardmin, hardmax);
RNA_def_property_ui_text(prop, ui_name, ui_description);
RNA_def_property_ui_range(prop, softmin, softmax, 1, 3);
Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
2011-11-18 09:23:55 UTC (rev 41961)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
