diff options
Diffstat (limited to 'source/blender/makesrna/rna_cleanup/rna_update.sh')
| -rwxr-xr-x | source/blender/makesrna/rna_cleanup/rna_update.sh | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/source/blender/makesrna/rna_cleanup/rna_update.sh b/source/blender/makesrna/rna_cleanup/rna_update.sh index a35ad6ef6c3..fa4bdb2cad4 100755 --- a/source/blender/makesrna/rna_cleanup/rna_update.sh +++ b/source/blender/makesrna/rna_cleanup/rna_update.sh @@ -1,4 +1,3 @@ -<<<<<<< .working cd ../../../../ ./blender.bin --background --python ./release/scripts/modules/rna_info.py 2> source/blender/makesrna/rna_cleanup/out.txt cd ./source/blender/makesrna/rna_cleanup/ @@ -12,18 +11,4 @@ mv out_work_lost_work.txt rna_properties_lost.txt cat rna_properties.txt | grep -v "^#" > rna_properties_edits.txt ./rna_cleaner.py rna_properties.txt echo "Updated: rna_properties.txt rna_properties_edits.txt rna_properties_lost.txt " -======= -cd ../../../../ -./blender.bin --background --python ./release/scripts/modules/rna_info.py 2> source/blender/makesrna/rna_cleanup/out.txt -cd ./source/blender/makesrna/rna_cleanup/ -./rna_cleaner.py out.txt -./rna_cleaner.py rna_properties.txt -./rna_cleaner_merge.py out_work.py rna_properties_work.py -./rna_cleaner.py out_work_merged.py -./rna_cleaner.py out_work_lost.py -mv out_work_merged_work.txt rna_properties.txt # overwrite -mv out_work_lost_work.txt rna_properties_lost.txt -cat rna_properties.txt | grep -v "^#" > rna_properties_edits.txt -./rna_cleaner.py rna_properties.txt -echo "Updated: rna_properties.txt rna_properties_edits.txt rna_properties_lost.txt " ->>>>>>> .merge-right.r35190 + |